增加 完成工单 短信模板

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

@@ -670,8 +670,8 @@ public class BmsEventOrderService {
         if (careMemberInfo == null) {
             return;
         }
-
-        boolean smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.ORDER_COMPLETE, careMemberInfo.getPhone(), house.getName());
+        String[] params = {house.getName(), OrderTypeEnum.getCodeToName(order.getOrderType())};
+        boolean smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.ORDER_COMPLETE, careMemberInfo.getPhone(), params);
         if (smsResult) {
             CareEventOrderHandleHis log = new CareEventOrderHandleHis();
             log.setOrgId(order.getOrgId());
@@ -758,8 +758,8 @@ public class BmsEventOrderService {
             if (careHouseContact == null) {
                 continue;
             }
-
-            boolean smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.ORDER_COMPLETE, orderContactorVO.getContactPhone(), house.getName());
+            String[] params = {house.getName(), OrderTypeEnum.getCodeToName(order.getOrderType())};
+            boolean smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.ORDER_COMPLETE, orderContactorVO.getContactPhone(), params);
 
             if (smsResult) {
                 CareEventOrderHandleHis log = new CareEventOrderHandleHis();
@@ -792,10 +792,11 @@ public class BmsEventOrderService {
             CareEventOrder order = this.careEventOrderService.getById(contactStatus.getOrderId());
             CareHouse house = this.careHouseService.getById(contactStatus.getHouseId());
             boolean smsResult = false;
+            String[] params = {house.getName()};
             if (OrderTypeEnum.JIU_ZHI.getValue().equals(order.getOrderType())){
-                 smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.JIU_ZHI,contactStatus.getContactPhone(),house.getName());
+                 smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.JIU_ZHI,contactStatus.getContactPhone(),params);
             }else if(OrderTypeEnum.DIE_DAO.getValue().equals(order.getOrderType())){
-                 smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.DIE_DAO,contactStatus.getContactPhone(),house.getName());
+                 smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.DIE_DAO,contactStatus.getContactPhone(),params);
             }
             if (smsResult){
                 CareEventOrderHandleHis his = new CareEventOrderHandleHis();

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

@@ -41,5 +41,5 @@ public interface SmsSendService  {
      * @param params
      * @return
      */
-    boolean sendSmsToLianxirenOrMember(SmsTemplateTypeEnum template , String phone, String params);
+    boolean sendSmsToLianxirenOrMember(SmsTemplateTypeEnum template , String phone, String[] params);
 }

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

@@ -220,13 +220,14 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
             if (switchSms != null){
                 //给联系人发送短信
                 CareHouse house = this.careHouseService.getById(order.getHouseId());
+                String[] params = {house.getName()};
                 if (CollUtil.isNotEmpty(contacts)){
                     contacts.forEach(item ->{
                         boolean smsResult = false;
                         if (OrderTypeEnum.JIU_ZHI.getValue().equals(order.getOrderType())){
-                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.JIU_ZHI,item.getContactPhone(),house.getName());
+                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.JIU_ZHI,item.getContactPhone(),params);
                         }else if(OrderTypeEnum.DIE_DAO.getValue().equals(order.getOrderType())){
-                             smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.DIE_DAO,item.getContactPhone(),house.getName());
+                             smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.DIE_DAO,item.getContactPhone(),params);
                         }
                         if (smsResult){
                             CareEventOrderHandleHis his2 = new CareEventOrderHandleHis();
@@ -251,9 +252,9 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                     chambList.forEach(item ->{
                         boolean smsResult = false;
                         if (OrderTypeEnum.JIU_ZHI.getValue().equals(order.getOrderType())){
-                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.JIU_ZHI,item.getPhone(),house.getName());
+                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.JIU_ZHI,item.getPhone(),params);
                         }else if(OrderTypeEnum.DIE_DAO.getValue().equals(order.getOrderType())){
-                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.DIE_DAO,item.getPhone(),house.getName());
+                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.DIE_DAO,item.getPhone(),params);
                         }
                         if (smsResult){
                             CareEventOrderHandleHis his2 = new CareEventOrderHandleHis();
@@ -546,13 +547,14 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
 
                 //给联系人发送短信
                 CareHouse house = this.careHouseService.getById(order.getHouseId());
+                String[] params = {house.getName()};
                 if (CollUtil.isNotEmpty(contacts)){
                     contacts.forEach(item ->{
                         boolean smsResult = false;
                         if (OrderTypeEnum.JIU_ZHI.getValue().equals(order.getOrderType())){
-                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.CANCEL_JIUZHI,item.getContactPhone(),house.getName());
+                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.CANCEL_JIUZHI,item.getContactPhone(),params);
                         }else if(OrderTypeEnum.DIE_DAO.getValue().equals(order.getOrderType())){
-                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.CANCEL_DIEDAO,item.getContactPhone(),house.getName());
+                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.CANCEL_DIEDAO,item.getContactPhone(),params);
                         }
                         if (smsResult){
                             CareEventOrderHandleHis his2 = new CareEventOrderHandleHis();
@@ -577,9 +579,9 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                     chambList.forEach(item ->{
                         boolean smsResult = false;
                         if (OrderTypeEnum.JIU_ZHI.getValue().equals(order.getOrderType())){
-                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.CANCEL_JIUZHI,item.getPhone(),house.getName());
+                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.CANCEL_JIUZHI,item.getPhone(),params);
                         }else if(OrderTypeEnum.DIE_DAO.getValue().equals(order.getOrderType())){
-                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.CANCEL_DIEDAO,item.getPhone(),house.getName());
+                            smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.CANCEL_DIEDAO,item.getPhone(),params);
                         }
                         if (smsResult){
                             CareEventOrderHandleHis his2 = new CareEventOrderHandleHis();

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

@@ -126,8 +126,7 @@ public class SmsSendServiceImpl implements SmsSendService {
 
 
     @Override
-    public boolean sendSmsToLianxirenOrMember(SmsTemplateTypeEnum template, String phone, String params) {
-        String[] _p = {params};
+    public boolean sendSmsToLianxirenOrMember(SmsTemplateTypeEnum template, String phone, String[] params) {
         String _noticeTemplateId =  "";
         if (SmsTemplateTypeEnum.DIE_DAO.equals(template)){
             _noticeTemplateId = noticeTemplateId4diedao;
@@ -148,7 +147,7 @@ public class SmsSendServiceImpl implements SmsSendService {
                     noticeSmsSdkAppId,
                     noticeSignName,
                     _noticeTemplateId,
-                    phone,_p);
+                    phone,params);
             if (sendStatus!=null && "Ok".equals(sendStatus.getCode())){
                 return true;
             }else{

src/main/resources/application.properties

@@ -88,7 +88,7 @@ sms.notice.templateid.register.phone=1041847
 sms.notice.templateid.modify.password=1041838
 sms.notic.templateid.cancel.jiuzhi=1156954
 sms.notic.templateid.cancel.diedao=1156955
-sms.notice.templateid.order.complete=1156955
+sms.notice.templateid.order.complete=1203847
 
 #语音信息
 voice.notice.endpoint=vms.tencentcloudapi.com