From 75ce0b214265c9a8683bb969a05f4aff9e47b8e6 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 19 Sep 2019 12:53:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=9B=9E=E8=B0=83=E5=9C=B0=E5=9D=80]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxCouponInjectServiceImpl.java | 7 ++++--- .../com/iformall/service/msg/impl/SendSmsServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java index 3b983a92b..b101d07ca 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java @@ -21,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; -import java.util.stream.Collectors; @Service public class WxCouponInjectServiceImpl implements WxCouponInjectService { @@ -119,10 +118,12 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { //2、通过标签 String phones = record.getPhones(); List filter = record.getFilterList(); - if (!phones.isEmpty() && !filter.isEmpty()) {//两种方式只能选其一 + if (!phones.isEmpty() && !filter.isEmpty()) { + //两种方式只能选其一 return new ResultData(ErrorCode.MSG_SEND_WAY_CHOOSE_ERROR); } - if (phones.isEmpty() && filter.isEmpty()) {//两种方式必须选其一 + if (phones.isEmpty() && filter.isEmpty()) { + //两种方式必须选其一 return new ResultData(ErrorCode.MSG_SEND_WAY_CHOOSE_ERROR); } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java index d91116eaa..8142e8e56 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java @@ -87,7 +87,7 @@ public class SendSmsServiceImpl implements MsgSendService { wxMsgValidationcode.setCode(record.getDynamicContentMap().get("s6")); } - String notifyUrl = wxMsgConfig.getNotifyurl(); + String notifyUrl = wxMsgConfig.getVerifynotifyurl(); Integer modelId = wxMsgValidationcodeModel.getModelId(); String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.YES.getCode().toString(), modelId); JSONObject jsonObjectResult = JSONObject.parseObject(result); @@ -108,7 +108,7 @@ public class SendSmsServiceImpl implements MsgSendService { wxMsgValidationcodeMapper.insertSelective(wxMsgValidationcode); wxMsgValidationcodeService.addMsgCallback(wxMsgValidationcode,batchNo); //扣减剩余条数 - wxMsgConfig.setRemains(1l); + wxMsgConfig.setRemains(1L); wxMsgConfigMapper.updateRemains(wxMsgConfig); }else{ throw new MallinkException(1001,"运营商返回失败:"+result);