diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index b7feff3d5..36911c642 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -363,6 +363,11 @@ public enum ErrorCode{ DEVICE_NOT_FOUND(26000, "设备未找到"), DEVICE_ALREADY_EXIST(26001, "设备已经存在"), DEVICE_QRCODE_GET_FAILED(26002, "微信二维码生成失败,请重试"), + /** + * 消息组件 + */ + MSG_MODEL_NOT_FOUND(27000, "找不到短信模板"), + MSG_CONFIG_NOT_FOUND(27001, "找不到短信配置"), ; private int code; diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java index 11bdfc9ca..21fb6c09c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java @@ -65,7 +65,7 @@ public interface WxFlowService { * @param params * @return */ - ResultData setBack(@RequestBody Map params,Long userId,String userName); + ResultData setBack(Map params,Long userId,String userName); /** * 生成流程图 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 9f3803a3b..06aa46464 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -197,13 +197,13 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } @Override - public ResultData listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { + public PageInfo listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { - return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record))); + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record)); } @Override - public ResultData detailCUserVo(Long cUserId, String couponOrderId) { + public WxCouponOrderCVo detailCUserVo(Long cUserId, String couponOrderId) { WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId); if (wxCuser == null) { logger.error("用户不存在:" + cUserId); @@ -212,8 +212,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.findDetailOfCUser(Long.valueOf(couponOrderId)); if (wxCouponOrderCVo == null) - return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); - return new ResultData(wxCouponOrderCVo); + throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); + return wxCouponOrderCVo; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 97c8e9cf3..eb3389715 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -10,6 +10,8 @@ import com.iformall.domain.po.*; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; +import com.iformall.mq.MqBaseProducer; +import com.iformall.mapper.*; import com.iformall.service.*; import com.iformall.utils.Constant; import org.apache.commons.collections.CollectionUtils; @@ -56,8 +58,6 @@ public class WxFlowServiceImpl implements WxFlowService { @Autowired private MallUserInfoService mallUserInfoService; @Autowired - private WxMsgValidationcodeService wxMsgValidationcodeService; - @Autowired private WxRentContractMapper wxRentContractMapper; @Autowired private WxPropertyContractMapper wxPropertyContractMapper; @@ -71,6 +71,8 @@ public class WxFlowServiceImpl implements WxFlowService { private WxBillPropertyMapper wxBillPropertyMapper; @Autowired private WxMerchantService wxMerchantService; + @Autowired + private MqBaseProducer mqBaseProducer; /** * 获取流程key,1合同 2账单 @@ -241,11 +243,13 @@ public class WxFlowServiceImpl implements WxFlowService { content.put("userName",starterInfo.getName()); content.put("page", Constant.adminPage); - WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(tenantId); - wxMsgValidationcode.setPhone(mallUserInfo.getPhone()); - wxMsgValidationcode.setType(EnumMsgModel.FLOW_ASSIGNEE_NODIFY.getCode()); - wxMsgValidationcodeService.sendWorkFlowNodify(wxMsgValidationcode,content); + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.FLOW_ASSIGNEE_NODIFY.getCode()); + wxMsgRecord.setReceiver(mallUserInfo.getPhone()); + wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.setDynamicContentMap(content); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); } return new ResultData(); } @@ -375,8 +379,8 @@ public class WxFlowServiceImpl implements WxFlowService { assigneeArray = assignee.get("assignee").split(","); userName = ""; for (String userid:assigneeArray) { - MallUserInfo mallUserInfo = this.mallUserInfoService.getById(Long.parseLong(userid)); - userName += mallUserInfo.getName()+" "; + MallUserInfo mallUserInfo = this.mallUserInfoService.getById(Long.parseLong(userid)); + userName += mallUserInfo.getName()+" "; } wxFlowRecord = new WxFlowRecord(); @@ -472,10 +476,13 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("userName",userName); msgReplaceMap.put("page",Constant.adminPage); - assignee += mallUserInfo.getName()+" "; - wxMsgValidationcode.setPhone(mallUserInfo.getPhone()); - wxMsgValidationcode.setType(EnumMsgModel.FLOW_ASSIGNEE_NODIFY.getCode()); - wxMsgValidationcodeService.sendWorkFlowNodify(wxMsgValidationcode,msgReplaceMap); + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.FLOW_ASSIGNEE_NODIFY.getCode()); + wxMsgRecord.setReceiver(mallUserInfo.getPhone()); + wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.setDynamicContentMap(msgReplaceMap); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); } // 给发起人发送短信 @@ -485,10 +492,13 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("contract",businessId+""); msgReplaceMap.put("toUserName",assignee.trim()); - wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setPhone(userMap!=null?(String)userMap.get("phone"):""); - wxMsgValidationcode.setType(EnumMsgModel.FLOW_APPLY_NODIFY.getCode()); - wxMsgValidationcodeService.sendWorkFlowNodify(wxMsgValidationcode,msgReplaceMap); + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.FLOW_APPLY_NODIFY.getCode()); + wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); + wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.setDynamicContentMap(msgReplaceMap); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); return false; }else{ //继续递归判断 @@ -501,10 +511,14 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap = new HashedMap(); msgReplaceMap.put("contract",businessId+""); msgReplaceMap.put("page",Constant.adminPage); - wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setPhone(userMap!=null?(String)userMap.get("phone"):""); - wxMsgValidationcode.setType(EnumMsgModel.FLOW_PASS_NODIFY.getCode()); - wxMsgValidationcodeService.sendWorkFlowNodify(wxMsgValidationcode,msgReplaceMap); + + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.FLOW_PASS_NODIFY.getCode()); + wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); + wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.setDynamicContentMap(msgReplaceMap); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); return true; } } @@ -583,10 +597,13 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("contract",businessId+""); msgReplaceMap.put("page",Constant.adminPage); - wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setPhone(userMap!=null?(String)userMap.get("phone"):""); - wxMsgValidationcode.setType(EnumMsgModel.FLOW_REJECT_NODIFY.getCode()); - wxMsgValidationcodeService.sendWorkFlowNodify(wxMsgValidationcode,msgReplaceMap); + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.FLOW_REJECT_NODIFY.getCode()); + wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); + wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.setDynamicContentMap(msgReplaceMap); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); return new ResultData(); }