定时任务发送手机号修改

crmeb-service/src/main/java/com/zbkj/service/service/impl/OnePassSmsServiceImpl.java

@@ -12,6 +12,7 @@ import com.zbkj.common.exception.CrmebException;
 import com.zbkj.common.model.admin.SystemAdmin;
 import com.zbkj.common.model.merchant.MerchantSms;
 import com.zbkj.common.model.merchant.MerchantSmsTemplate;
+import com.zbkj.common.model.merchant.MerchantSmsTiming;
 import com.zbkj.common.model.sms.SmsTemplate;
 import com.zbkj.common.model.system.SystemNotification;
 import com.zbkj.common.request.PageParamRequest;
@@ -60,6 +61,8 @@ public class OnePassSmsServiceImpl implements OnePassSmsService, SmsService {
     private MerchantSmsTemplateService merchantSmsTemplateService;
     @Autowired
     private MerchantSmsService merchantSmsService;
+    @Autowired
+    private MerchantSmsTimingService merchantSmsTimingService;
 
     /**
      * 修改签名
@@ -194,7 +197,7 @@ public class OnePassSmsServiceImpl implements OnePassSmsService, SmsService {
         one.setTransmissionTimesThen(one.getTransmissionTimesThen() + a);
         merchantSmsService.updateById(one);
         MerchantSmsTemplate merchantSmsTemplate = merchantSmsTemplateService.selectByTempId(String.valueOf(tempId));
-        if(null!=merchantSmsTemplate){
+        if (null != merchantSmsTemplate) {
             merchantSmsTemplate.setLastUpdateTime(new Date());
             merchantSmsTemplateService.updateById(merchantSmsTemplate);
         }
@@ -204,6 +207,11 @@ public class OnePassSmsServiceImpl implements OnePassSmsService, SmsService {
 
     @Override
     public Boolean sendSSM2(String phone, Integer tempId, Integer merId, Integer isLastDay) {
+
+        MerchantSmsTiming smsTiming = merchantSmsTimingService.selectByTempId(String.valueOf(tempId));
+        if (null!=smsTiming){
+           phone = smsTiming.getPhone();
+        }
         if (null == isLastDay) {
             isLastDay = 2;
         }
@@ -236,7 +244,7 @@ public class OnePassSmsServiceImpl implements OnePassSmsService, SmsService {
                 one.setTransmissionTimesThen(one.getTransmissionTimesThen() + a);
                 merchantSmsService.updateById(one);
                 MerchantSmsTemplate merchantSmsTemplate = merchantSmsTemplateService.selectByTempId(String.valueOf(tempId));
-                if(null!=merchantSmsTemplate){
+                if (null != merchantSmsTemplate) {
                     merchantSmsTemplate.setLastUpdateTime(new Date());
                     merchantSmsTemplateService.updateById(merchantSmsTemplate);
                 }
@@ -269,7 +277,7 @@ public class OnePassSmsServiceImpl implements OnePassSmsService, SmsService {
                 one.setTransmissionTimesThen(one.getTransmissionTimesThen() + a);
                 merchantSmsService.updateById(one);
                 MerchantSmsTemplate merchantSmsTemplate = merchantSmsTemplateService.selectByTempId(String.valueOf(tempId));
-                if(null!=merchantSmsTemplate){
+                if (null != merchantSmsTemplate) {
                     merchantSmsTemplate.setLastUpdateTime(new Date());
                     merchantSmsTemplateService.updateById(merchantSmsTemplate);
                 }