Jelajahi Sumber

更新短信模版

lilt085163@126.com 3 tahun lalu
induk
melakukan
eb467bef25

+ 2 - 1
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());

+ 3 - 3
src/main/java/com/care/common/service/SmsSendService.java

@@ -15,13 +15,13 @@ public interface SmsSendService  {
      */
     boolean sendSmsCode4RegisterPhone(String phone,String params);
 
-    /**
+/*    *//**
      * 给紧急联系人发送短信
      * @param phone
      * @param params
      * @return
-     */
-    boolean sendSmsToLianxiren(String phone,String params);
+     *//*
+    boolean sendSmsToLianxiren(String phone,String params);*/
 
     /**
      * 给紧急联系人发送短信

+ 20 - 16
src/main/java/com/care/common/service/impl/SmsSendServiceImpl.java

@@ -1,5 +1,6 @@
 package com.care.common.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.care.common.enums.OrderTypeEnum;
 import com.care.common.service.SmsSendService;
 import com.care.common.util.SmsUtil;
@@ -28,8 +29,6 @@ public class SmsSendServiceImpl implements SmsSendService {
     @Value("${sms.notice.smsSdkAppId:#{null}}")
     private String noticeSmsSdkAppId;
     private String noticeSignName="熵行科技";
-    @Value("${sms.notice.templateId:#{null}}")
-    private String noticeTemplateId;
 
     @Value("${sms.notice.templateid.register.phone:#{null}}")
     private String noticeTemplateId4registerPhone;
@@ -65,9 +64,10 @@ public class SmsSendServiceImpl implements SmsSendService {
         }
     }
 
-    @Override
+   /* @Override
     public boolean sendSmsToLianxiren(String phone, String params) {
         String[] _p = {params};
+
         SendStatus sendStatus =  SmsUtil.sendSms(noticeEndpoint,
                 noticeRegion,
                 noticeSecretId,
@@ -81,28 +81,32 @@ public class SmsSendServiceImpl implements SmsSendService {
         }else{
             return  false;
         }
-    }
+    }*/
 
     @Override
     public boolean sendSmsToLianxiren(String orderType, String phone, String params) {
         String[] _p = {params};
-        String _noticeTemplateId =  noticeTemplateId;
+        String _noticeTemplateId =  "";
         if (OrderTypeEnum.DI_EDAO.getValue().equals(orderType)){
             _noticeTemplateId = noticeTemplateId4diedao;
         }else if(OrderTypeEnum.JIU_ZHI.getValue().equals(orderType)){
             _noticeTemplateId = noticeTemplateId4jiuzhi;
         }
-        SendStatus sendStatus =  SmsUtil.sendSms(noticeEndpoint,
-                noticeRegion,
-                noticeSecretId,
-                noticeecretKey,
-                noticeSmsSdkAppId,
-                noticeSignName,
-                _noticeTemplateId,
-                phone,_p);
-        if (sendStatus!=null && "Ok".equals(sendStatus.getCode())){
-            return true;
-        }else{
+        if (StrUtil.isNotEmpty(_noticeTemplateId)){
+            SendStatus sendStatus =  SmsUtil.sendSms(noticeEndpoint,
+                    noticeRegion,
+                    noticeSecretId,
+                    noticeecretKey,
+                    noticeSmsSdkAppId,
+                    noticeSignName,
+                    _noticeTemplateId,
+                    phone,_p);
+            if (sendStatus!=null && "Ok".equals(sendStatus.getCode())){
+                return true;
+            }else{
+                return  false;
+            }
+        }else {
             return  false;
         }
     }

+ 1 - 1
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);
     }

+ 2 - 3
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