Просмотр исходного кода

[邮件][修改][添加动态背景]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
18572f7cc3
2 измененных файлов: 26 добавлений и 2 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java
  2. +24
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java Просмотреть файл

@@ -309,7 +309,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
list = wxCouponActionLogMapper.sceneDataList(params); list = wxCouponActionLogMapper.sceneDataList(params);
}else { }else {
PageHelper.clearPage(); PageHelper.clearPage();
list = new ArrayList<MarkingSceneDataVo>();
list = new ArrayList<>();
} }




@@ -432,7 +432,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
if (StringUtils.isNotBlank(endDate)) if (StringUtils.isNotBlank(endDate))
params.put("endTime", endDate); params.put("endTime", endDate);


List<String> days = DateUtils.getTjTimeList(startDate,endDate,"0");
List<String> days = DateUtils.getTjTimeList(startDate.substring(0,10),endDate.substring(0,10),"0");
TreeMap<String, Object> historyMap = new TreeMap<>(); TreeMap<String, Object> historyMap = new TreeMap<>();


//停车发券 //停车发券


+ 24
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Просмотреть файл

@@ -411,6 +411,12 @@ public class WxFlowServiceImpl implements WxFlowService {
wxMsgRecord.setModelType(EnumMsgModel.FLOW_ASSIGNEE_NODIFY.getCode()); wxMsgRecord.setModelType(EnumMsgModel.FLOW_ASSIGNEE_NODIFY.getCode());
wxMsgRecord.setReceiver(phone); wxMsgRecord.setReceiver(phone);
wxMsgRecord.setTenantId(tenantId); wxMsgRecord.setTenantId(tenantId);
if(1 == flowType.intValue() || 3 == flowType.intValue()){
dynamicContentMap.put("bustype","合同");
}else if(2 == flowType.intValue()){
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());


@@ -731,6 +737,12 @@ public class WxFlowServiceImpl implements WxFlowService {
wxMsgRecord.setModelType(EnumMsgModel.FLOW_APPLY_NODIFY.getCode()); wxMsgRecord.setModelType(EnumMsgModel.FLOW_APPLY_NODIFY.getCode());
wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):"");
wxMsgRecord.setTenantId(tenantId); wxMsgRecord.setTenantId(tenantId);
if(1 == flowType.intValue() || 3 == flowType.intValue()){
msgReplaceMap.put("bustype","合同");
}else if(2 == flowType.intValue()){
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());


@@ -770,6 +782,12 @@ public class WxFlowServiceImpl implements WxFlowService {
wxMsgRecord.setModelType(EnumMsgModel.FLOW_PASS_NODIFY.getCode()); wxMsgRecord.setModelType(EnumMsgModel.FLOW_PASS_NODIFY.getCode());
wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):"");
wxMsgRecord.setTenantId(tenantId); wxMsgRecord.setTenantId(tenantId);
if(1 == flowType.intValue() || 3 == flowType.intValue()){
msgReplaceMap.put("bustype","合同");
}else if(2 == flowType.intValue()){
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());


@@ -876,6 +894,12 @@ public class WxFlowServiceImpl implements WxFlowService {
wxMsgRecord.setModelType(EnumMsgModel.FLOW_REJECT_NODIFY.getCode()); wxMsgRecord.setModelType(EnumMsgModel.FLOW_REJECT_NODIFY.getCode());
wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):"");
wxMsgRecord.setTenantId(tenantId); wxMsgRecord.setTenantId(tenantId);
if(1 == flowType.intValue() || 3 == flowType.intValue()){
msgReplaceMap.put("bustype","合同");
}else if(2 == flowType.intValue()){
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());




Загрузка…
Отмена
Сохранить