diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index fbe395492..b4e75fbb0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -341,6 +341,9 @@ public class WxMsgServiceImpl implements WxMsgService { for (int i = 0; i < extracount; i++) { WxMsg wxMsg1 = new WxMsg(); wxMsg1.setId(wxMsg.getId()); + wxMsg1.setSignature(wxMsg.getSignature()); + wxMsg1.setMsg(wxMsg.getMsg()); + wxMsg1.setModelId(wxMsg.getModelId()); if (extra > 0 && i == index) { List phoneList = Arrays.asList(split).subList(i * 1000, length); String phones = StringUtils.join(phoneList, ","); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java index 091b559e9..5ec0645c7 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java @@ -75,16 +75,10 @@ public class SendCallBackSmsServiceImpl implements MsgSendService { throw new MallinkException(ErrorCode.MSG_CONFIG_ACCOUNT); } } - WxCouponInject couponInject = record.getCouponInject(); - - String secret = wxMsgConfig.getSecret(); - String bid = wxMsgConfig.getBid(); - String publickey = wxMsgConfig.getPublickey(); String phone = record.getPhones(); String signature = record.getSignature(); String msg = record.getMsg(); - String notifyUrl = wxMsgConfig.getNotifyurl(); WxMsgModel wxMsgModel = wxMsgModelMapper.selectById(record.getModelId()); Integer modelId = null; if (wxMsgModel != null) { @@ -143,9 +137,11 @@ public class SendCallBackSmsServiceImpl implements MsgSendService { wxMsgService.addMsgCallback(record, batchNo); //wx_msg改为已发送 record.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); + record.setExpectSendNumber(null); wxMsgMapper.updateById(record); } else { logger.error("发送:{},运营商返回失败:{}",phone,result); + record.setExpectSendNumber(null); wxMsgMapper.updateById(record); throw new MallinkException(1001,"运营商返回失败:"+result); }