diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index e9884cbcd..2608a5298 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -95,7 +95,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { wxMsgCallback.setId(idWorker.nextId()); wxMsgCallback.setCallbackId(callbackId); wxMsgCallback.setTenantId(tenantId); - wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); + wxMsgCallback.setSign(param.get("sign")); wxMsgCallback.setCreatetime(new Date()); wxMsgCallbackMapper.insertSelective(wxMsgCallback); } 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 425299092..432f9be36 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -308,7 +308,7 @@ public class WxMsgServiceImpl implements WxMsgService { public void addMsgCallback(WxMsg wxmsg, String batchNo){ - logger.info("发送时主动添加回调记录开始..."); + logger.info("营销短信发送时主动添加回调记录开始..."); String phones = wxmsg.getPhones(); String[] split = phones.split(","); final IdWorker idWorker = IdWorker.get(); @@ -323,7 +323,7 @@ public class WxMsgServiceImpl implements WxMsgService { wxMsgCallback.setCreatetime(new Date()); wxMsgCallbackMapper.insertSelective(wxMsgCallback); } - logger.info("发送时主动添加回调记录结束..."); + logger.info("营销短信发送时主动添加回调记录结束..."); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java index a49612a3a..7911f3b32 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.enums.EnumMsgSendStatus; import com.iformall.mapper.*; import com.iformall.service.WxMsgValidationcodeService; import com.iformall.utils.AesUtil; @@ -46,6 +47,9 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic @Autowired WxMerchantMapper wxMerchantMapper; + @Autowired + WxMsgCallbackMapper wxMsgCallbackMapper; + @Override public PageInfo listAsPage(WxMsgValidationcode record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMsgValidationcodeMapper.findList(record)); @@ -156,7 +160,7 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic String result = HttpUtil.doPost(requestUrl, params); JSONObject jsonObjectResult = JSONObject.parseObject(result); String ret = jsonObjectResult.get("ret").toString(); - + String batchNo = jsonObjectResult.get("data").toString(); if (ret.equals("1")) { final IdWorker idWorker = IdWorker.get(); wxMsgValidationcode.setId(idWorker.nextId()); @@ -168,12 +172,29 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic wxMsgValidationcode.setExpiretime(expiredate); wxMsgValidationcode.setCreatetime(createtime); wxMsgValidationcodeMapper.insertSelective(wxMsgValidationcode); + addMsgCallback(wxMsgValidationcode,batchNo); return new ResultData(Result.SUCCESS,"发送成功"); } return new ResultData(ErrorCode.MSG_SEND_ERROR.getCode(),"发送失败"); } + public void addMsgCallback(WxMsgValidationcode wxmsg, String batchNo){ + logger.info("验证码发送时主动添加回调记录开始..."); + String phone = wxmsg.getPhone(); + final IdWorker idWorker = IdWorker.get(); + WxMsgCallback wxMsgCallback = new WxMsgCallback(); + wxMsgCallback.setId(idWorker.nextId()); + wxMsgCallback.setPhone(phone); + wxMsgCallback.setTenantId(wxmsg.getTenantId()); + wxMsgCallback.setBatchNo(batchNo); + wxMsgCallback.setMsgId(wxmsg.getId()); + wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); + wxMsgCallback.setCreatetime(new Date()); + wxMsgCallbackMapper.insertSelective(wxMsgCallback); + logger.info("验证码发送时主动添加回调记录结束..."); + } + @Override public ResultData hasvalidationcode(WxMsgValidationcode record) {