|
|
@@ -239,6 +239,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()); |
|
|
wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
wxCoupon.setApprovalType(operateType); |
|
|
wxCouponMapper.updateByPrimaryKeySelective(wxCoupon); |
|
|
wxCouponMapper.updateByPrimaryKeySelective(wxCoupon); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@@ -338,7 +339,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
wxFlowRecord.setStartDate(startDate); |
|
|
wxFlowRecord.setStartDate(startDate); |
|
|
wxFlowRecordService.saveOrUpdate(wxFlowRecord); |
|
|
wxFlowRecordService.saveOrUpdate(wxFlowRecord); |
|
|
|
|
|
|
|
|
// 给审批人发送代办通知短信 |
|
|
|
|
|
|
|
|
//给审批人发送代办通知短信 |
|
|
List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstance.getId()); |
|
|
List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstance.getId()); |
|
|
for (MallUserInfo mallUserInfo:mallUserInfoList) { |
|
|
for (MallUserInfo mallUserInfo:mallUserInfoList) { |
|
|
sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),starterInfo.getName(),businessId,flowType); |
|
|
sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),starterInfo.getName(),businessId,flowType); |
|
|
@@ -360,6 +361,9 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
}else if(isBill(flowType)){ |
|
|
}else if(isBill(flowType)){ |
|
|
dynamicContentMap.put("bustype","账单"); |
|
|
dynamicContentMap.put("bustype","账单"); |
|
|
dynamicContentMap.put("contract", businessId.toString()); |
|
|
dynamicContentMap.put("contract", businessId.toString()); |
|
|
|
|
|
}else if(isCoupon(flowType)){ |
|
|
|
|
|
dynamicContentMap.put("bustype","有价卷"); |
|
|
|
|
|
dynamicContentMap.put("contract",businessId.toString()); |
|
|
} |
|
|
} |
|
|
wxMsgRecord.setDynamicContentMap(dynamicContentMap); |
|
|
wxMsgRecord.setDynamicContentMap(dynamicContentMap); |
|
|
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); |
|
|
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); |
|
|
@@ -436,6 +440,9 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
}else if(isBill(flowType)){ |
|
|
}else if(isBill(flowType)){ |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
|
|
|
}else if(isCoupon(flowType)){ |
|
|
|
|
|
msgReplaceMap.put("bustype","有价卷"); |
|
|
|
|
|
msgReplaceMap.put("contract",businessId.toString()); |
|
|
} |
|
|
} |
|
|
mailMsg.setDynamicContentMap(msgReplaceMap); |
|
|
mailMsg.setDynamicContentMap(msgReplaceMap); |
|
|
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); |
|
|
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); |
|
|
@@ -462,6 +469,16 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
} |
|
|
} |
|
|
return false; |
|
|
return false; |
|
|
} |
|
|
} |
|
|
|
|
|
public boolean isCoupon(Integer flowType){ |
|
|
|
|
|
if(EnumFlowKey.NEW_COUPON_UPLINE.getCode().equals(flowType) |
|
|
|
|
|
||EnumFlowKey.NEW_CARD_UPLINE.getCode().equals(flowType) |
|
|
|
|
|
||EnumFlowKey.NEW_GROUP_UPLINE.getCode().equals(flowType) |
|
|
|
|
|
||EnumFlowKey.NEW_PRESS_UPLINE.getCode().equals(flowType) |
|
|
|
|
|
){ |
|
|
|
|
|
return true; |
|
|
|
|
|
} |
|
|
|
|
|
return false; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
public String variablesToJson(List<Map<String,Object>> variables){ |
|
|
public String variablesToJson(List<Map<String,Object>> variables){ |
|
|
HashMap<String,Object> map = new HashMap<>(); |
|
|
HashMap<String,Object> map = new HashMap<>(); |
|
|
@@ -837,6 +854,9 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
}else if(isBill(flowType)){ |
|
|
}else if(isBill(flowType)){ |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
|
|
|
}else if(isCoupon(flowType)){ |
|
|
|
|
|
msgReplaceMap.put("bustype","有价卷"); |
|
|
|
|
|
msgReplaceMap.put("contract",businessId.toString()); |
|
|
} |
|
|
} |
|
|
wxMsgRecord.setDynamicContentMap(msgReplaceMap); |
|
|
wxMsgRecord.setDynamicContentMap(msgReplaceMap); |
|
|
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); |
|
|
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); |
|
|
@@ -856,6 +876,9 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
}else if(isBill(flowType)){ |
|
|
}else if(isBill(flowType)){ |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
|
|
|
}else if(isCoupon(flowType)){ |
|
|
|
|
|
msgReplaceMap.put("bustype","有价卷"); |
|
|
|
|
|
msgReplaceMap.put("contract",businessId.toString()); |
|
|
} |
|
|
} |
|
|
mailMsg.setDynamicContentMap(msgReplaceMap); |
|
|
mailMsg.setDynamicContentMap(msgReplaceMap); |
|
|
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); |
|
|
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); |
|
|
@@ -885,6 +908,9 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
}else if(isBill(flowType)){ |
|
|
}else if(isBill(flowType)){ |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
|
|
|
}else if(isCoupon(flowType)){ |
|
|
|
|
|
msgReplaceMap.put("bustype","有价卷"); |
|
|
|
|
|
msgReplaceMap.put("contract",businessId.toString()); |
|
|
} |
|
|
} |
|
|
wxMsgRecord.setDynamicContentMap(msgReplaceMap); |
|
|
wxMsgRecord.setDynamicContentMap(msgReplaceMap); |
|
|
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); |
|
|
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); |
|
|
@@ -904,6 +930,9 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
}else if(isBill(flowType)){ |
|
|
}else if(isBill(flowType)){ |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
|
|
|
}else if(isCoupon(flowType)){ |
|
|
|
|
|
msgReplaceMap.put("bustype","有价卷"); |
|
|
|
|
|
msgReplaceMap.put("contract",businessId.toString()); |
|
|
} |
|
|
} |
|
|
mailMsg.setDynamicContentMap(msgReplaceMap); |
|
|
mailMsg.setDynamicContentMap(msgReplaceMap); |
|
|
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); |
|
|
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); |
|
|
@@ -1020,6 +1049,9 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
}else if(isBill(flowType)){ |
|
|
}else if(isBill(flowType)){ |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
|
|
|
}else if(isCoupon(flowType)){ |
|
|
|
|
|
msgReplaceMap.put("bustype","有价卷"); |
|
|
|
|
|
msgReplaceMap.put("contract",businessId.toString()); |
|
|
} |
|
|
} |
|
|
wxMsgRecord.setDynamicContentMap(msgReplaceMap); |
|
|
wxMsgRecord.setDynamicContentMap(msgReplaceMap); |
|
|
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); |
|
|
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); |
|
|
@@ -1046,6 +1078,9 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
}else if(isBill(flowType)){ |
|
|
}else if(isBill(flowType)){ |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("bustype","账单"); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
msgReplaceMap.put("contract", businessId.toString()); |
|
|
|
|
|
}else if(isCoupon(flowType)){ |
|
|
|
|
|
msgReplaceMap.put("bustype","有价卷"); |
|
|
|
|
|
msgReplaceMap.put("contract",businessId.toString()); |
|
|
} |
|
|
} |
|
|
mailMsg.setDynamicContentMap(msgReplaceMap); |
|
|
mailMsg.setDynamicContentMap(msgReplaceMap); |
|
|
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); |
|
|
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); |
|
|
|