Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/care/common/service/SmsSendService.java
#	src/main/java/com/care/common/service/impl/SmsSendServiceImpl.java

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -603,8 +603,9 @@ public class BmsEventOrderService {
 
         CareEventOrderContactStatus contactStatus = this.careEventOrderContactStatusService.getById(orderContactId);
         if (contactStatus!=null){
+            CareEventOrder order = this.careEventOrderService.getById(contactStatus.getOrderId());
             CareHouse house = this.careHouseService.getById(contactStatus.getHouseId());
-            boolean smsResult = smsSendService.sendSmsToLianxiren(contactStatus.getContactPhone(),house.getName());
+            boolean smsResult = smsSendService.sendSmsToLianxiren(order.getOrderType(),contactStatus.getContactPhone(),house.getName());
             if (smsResult){
                 CareEventOrderHandleHis his = new CareEventOrderHandleHis();
                 his.setOrgId(contactStatus.getOrgId());

src/main/java/com/care/common/service/SmsSendService.java

@@ -15,20 +15,6 @@ public interface SmsSendService  {
      */
     boolean sendSmsCode4RegisterPhone(String phone,String params);
 
-    /**
-     * 重置密码发送短信验证码
-     * @param phone
-     * @return
-     */
-    boolean sendSmsCode4ModifyPassword(String phone,String params);
-
-    /**
-     * 修改手机号发送短信验证码
-     * @param phone
-     * @return
-     */
-    boolean sendSmsCode4ModifyPhone(String phone,String params);
-
     /**
      * 给紧急联系人发送短信
      * @param phone

src/main/java/com/care/common/service/impl/SmsSendServiceImpl.java

@@ -34,18 +34,13 @@ public class SmsSendServiceImpl implements SmsSendService {
     @Value("${sms.notice.templateid.register.phone:#{null}}")
     private String noticeTemplateId4registerPhone;
 
-    @Value("${sms.notice.templateid.modify.password:#{null}}")
-    private String noticeTemplateId4modifyPassword;
-
-    @Value("${sms.notice.templateid.modify.phone:#{null}}")
-    private String noticeTemplateId4ModifyPhone;
-
     @Value("${sms.notice.templateid.jiuzhi:#{null}}")
     private String noticeTemplateId4jiuzhi;
 
     @Value("${sms.notice.templateid.diedao:#{null}}")
     private String noticeTemplateId4diedao;
 
+
     /**
      * 注册手机号发送短信验证码
      * @param phone
@@ -70,54 +65,6 @@ public class SmsSendServiceImpl implements SmsSendService {
         }
     }
 
-    /**
-     * 重置密码发送短信验证码
-     * @param phone
-     * @return
-     */
-    @Override
-    public boolean sendSmsCode4ModifyPassword(String phone,String params) {
-
-        String[] _p = {params};
-        SendStatus sendStatus =  SmsUtil.sendSms(noticeEndpoint,
-                noticeRegion,
-                noticeSecretId,
-                noticeecretKey,
-                noticeSmsSdkAppId,
-                noticeSignName,
-                noticeTemplateId4modifyPassword,
-                phone,_p);
-        if (sendStatus!=null && "Ok".equals(sendStatus.getCode())){
-            return true;
-        }else{
-            return  false;
-        }
-    }
-
-    /**
-     * 修改手机号发送短信验证码
-     * @param phone
-     * @return
-     */
-    @Override
-    public boolean sendSmsCode4ModifyPhone(String phone,String params) {
-
-        String[] _p = {params};
-        SendStatus sendStatus =  SmsUtil.sendSms(noticeEndpoint,
-                noticeRegion,
-                noticeSecretId,
-                noticeecretKey,
-                noticeSmsSdkAppId,
-                noticeSignName,
-                noticeTemplateId4ModifyPhone,
-                phone,_p);
-        if (sendStatus!=null && "Ok".equals(sendStatus.getCode())){
-            return true;
-        }else{
-            return  false;
-        }
-    }
-
     @Override
     public boolean sendSmsToLianxiren(String phone, String params) {
         String[] _p = {params};

src/main/java/com/care/common/util/SmsUtil.java

@@ -69,7 +69,7 @@ public class SmsUtil {
                 String phoneNumber = "18010375763";
                 String SmsSdkAppId = "1400531694";
                 String signName ="熵行科技";
-                String templateId ="986791";
+                String templateId ="1097265";
                 String[] templateParam = {"北太平庄201"};
                 sendSms("sms.tencentcloudapi.com","ap-beijing",SecretId,SecretKey,SmsSdkAppId,signName,templateId,phoneNumber,templateParam);
     }

src/main/resources/application.properties

@@ -72,10 +72,9 @@ sms.notice.region=ap-beijing
 sms.notice.secretId=AKIDkKfkbCX0HJ4YkgMlunPkpdBSVHo43mEQ
 sms.notice.secretKey=wb08zZrRkmY3IGyPZS4PUIp66pHUQ6Vd
 sms.notice.smsSdkAppId=1400531694
-sms.notice.templateId=986791
 
-sms.notice.templateid.jiuzhi=1014148
-sms.notice.templateid.diedao=1014144
+sms.notice.templateid.jiuzhi=1097265
+sms.notice.templateid.diedao=1097262
 sms.notice.templateid.modify.phone=1041851
 sms.notice.templateid.register.phone=1041847
 sms.notice.templateid.modify.password=1041838