| @@ -414,12 +414,12 @@ public class WxFlowServiceImpl implements WxFlowService { | |||
| //给审批人发送代办通知短信 | |||
| List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstance.getId()); | |||
| for (MallUserInfo mallUserInfo:mallUserInfoList) { | |||
| sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),starterInfo.getName(),businessId,flowType); | |||
| sendAssigneeMsgAndEmail(tenantId, mallUserInfo.getPhone(), mallUserInfo.getEmail(), starterInfo.getName(), businessId, flowType, variables); | |||
| } | |||
| return new ResultData(); | |||
| } | |||
| public void sendAssigneeMsgAndEmail(String tenantId,String phone,String email,String userName,Long businessId,Integer flowType){ | |||
| public void sendAssigneeMsgAndEmail(String tenantId, String phone, String email, String userName, Long businessId, Integer flowType, List<Map<String, Object>> variables) { | |||
| Map<String,String> dynamicContentMap = new HashMap<>(); | |||
| dynamicContentMap.put("userName",userName); | |||
| dynamicContentMap.put("page", Constant.adminPage); | |||
| @@ -437,7 +437,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||
| wxMsgRecord.setModelType(EnumMsgModel.FLOW_C_ASSIGNEE_NODIFY.getCode()); | |||
| }else if(isSettle(flowType)){ | |||
| dynamicContentMap.put("bustype","结算单"); | |||
| dynamicContentMap.put("contract", businessId.toString()); | |||
| dynamicContentMap.put("contract", (String) getVariableByKey(variables, "settleNumber")); | |||
| } | |||
| wxMsgRecord.setDynamicContentMap(dynamicContentMap); | |||
| mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); | |||
| @@ -518,7 +518,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||
| mailMsg.setModelType(EnumMailMsgModel.MAIL_C_ASSIGNEE_NODIFY.getCode()); | |||
| }else if(isSettle(flowType)){ | |||
| msgReplaceMap.put("bustype","结算单"); | |||
| msgReplaceMap.put("contract", businessId.toString()); | |||
| msgReplaceMap.put("contract", getVariableByKey(variables, "settleNumber")); | |||
| } | |||
| mailMsg.setDynamicContentMap(msgReplaceMap); | |||
| mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | |||
| @@ -936,7 +936,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||
| List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstanceId); | |||
| for (int i = 0; i < mallUserInfoList.size(); i++) { | |||
| MallUserInfo mallUserInfo = mallUserInfoList.get(i); | |||
| sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),userName,businessId,flowType); | |||
| sendAssigneeMsgAndEmail(tenantId, mallUserInfo.getPhone(), mallUserInfo.getEmail(), userName, businessId, flowType, variables); | |||
| if(i == mallUserInfoList.size()-1){ | |||
| assignee += mallUserInfo.getName(); | |||
| }else{ | |||
| @@ -967,7 +967,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||
| msgReplaceMap.put("name",wxCoupon.getTitle()); | |||
| }else if(isSettle(flowType)){ | |||
| msgReplaceMap.put("bustype","结算单"); | |||
| msgReplaceMap.put("contract", businessId.toString()); | |||
| msgReplaceMap.put("contract", (String) getVariableByKey(variables, "settleNumber")); | |||
| } | |||
| wxMsgRecord.setDynamicContentMap(msgReplaceMap); | |||
| mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); | |||
| @@ -994,7 +994,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||
| msgReplaceMap.put("name",wxCoupon.getTitle()); | |||
| }else if(isSettle(flowType)){ | |||
| msgReplaceMap.put("bustype","结算单"); | |||
| msgReplaceMap.put("contract", businessId.toString()); | |||
| msgReplaceMap.put("contract", (String) getVariableByKey(variables, "settleNumber")); | |||
| } | |||
| mailMsg.setDynamicContentMap(msgReplaceMap); | |||
| mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | |||
| @@ -1031,7 +1031,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||
| msgReplaceMap.put("name",wxCoupon.getTitle()); | |||
| }else if(isSettle(flowType)){ | |||
| msgReplaceMap.put("bustype","结算单"); | |||
| msgReplaceMap.put("contract", businessId.toString()); | |||
| msgReplaceMap.put("contract", (String) getVariableByKey(variables, "settleNumber")); | |||
| } | |||
| wxMsgRecord.setDynamicContentMap(msgReplaceMap); | |||
| mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); | |||
| @@ -1058,7 +1058,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||
| msgReplaceMap.put("name",wxCoupon.getTitle()); | |||
| }else if(isSettle(flowType)){ | |||
| msgReplaceMap.put("bustype","结算单"); | |||
| msgReplaceMap.put("contract", businessId.toString()); | |||
| msgReplaceMap.put("contract", (String) getVariableByKey(variables, "settleNumber")); | |||
| } | |||
| mailMsg.setDynamicContentMap(msgReplaceMap); | |||
| mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | |||
| @@ -1184,7 +1184,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||
| msgReplaceMap.put("name",wxCoupon.getTitle()); | |||
| }else if (isSettle(flowType)) { | |||
| msgReplaceMap.put("bustype", "结算单"); | |||
| msgReplaceMap.put("contract", businessId.toString()); | |||
| msgReplaceMap.put("contract", (String) getVariableByKey(variables, "settleNumber")); | |||
| } | |||
| wxMsgRecord.setDynamicContentMap(msgReplaceMap); | |||
| mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | |||
| @@ -1219,7 +1219,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||
| msgReplaceMap.put("name",wxCoupon.getTitle()); | |||
| }else if(isSettle(flowType)){ | |||
| msgReplaceMap.put("bustype","结算单"); | |||
| msgReplaceMap.put("contract", businessId.toString()); | |||
| msgReplaceMap.put("contract", (String) getVariableByKey(variables, "settleNumber")); | |||
| } | |||
| mailMsg.setDynamicContentMap(msgReplaceMap); | |||
| mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | |||