|
|
|
@@ -2,10 +2,7 @@ package com.iformall.controller.msg; |
|
|
|
|
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.controller.base.BaseController; |
|
|
|
import com.iformall.domain.po.msg.MailMsg; |
|
|
|
import com.iformall.domain.po.msg.SmartAppMsg; |
|
|
|
import com.iformall.domain.po.msg.WxMsg; |
|
|
|
import com.iformall.domain.po.msg.WxMsgRecord; |
|
|
|
import com.iformall.domain.po.msg.*; |
|
|
|
import com.iformall.enums.*; |
|
|
|
import com.iformall.mapper.WxMsgMapper; |
|
|
|
import com.iformall.mq.MqBaseProducer; |
|
|
|
@@ -66,9 +63,11 @@ public class WxMsgRecordController extends BaseController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping(value = "/resendMsg") |
|
|
|
public ResultData resendMsg(String x) { |
|
|
|
public ResultData resendMsg(String x, String tenantId, Integer msgType) { |
|
|
|
if("xll1dxx1314".equals(x)){ |
|
|
|
WxMsgRecord msgRecord = new WxMsgRecord(); |
|
|
|
msgRecord.setTenantId(tenantId); |
|
|
|
msgRecord.setMsgType(msgType); |
|
|
|
msgRecord.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode()); |
|
|
|
List<WxMsgRecord> recordList = wxMsgRecordService.findList(msgRecord); |
|
|
|
for (WxMsgRecord wxMsgRecord:recordList) { |
|
|
|
@@ -96,6 +95,20 @@ public class WxMsgRecordController extends BaseController { |
|
|
|
wxMsg.setReceiver(wxMsgRecord.getReceiver()); |
|
|
|
wxMsg.setTenantId(wxMsgRecord.getTenantId()); |
|
|
|
mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); |
|
|
|
}else if(EnumMsgRecordType.INSIDE_ORDER_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ |
|
|
|
//内部消息 - 下订单成功 |
|
|
|
FmInsideOrderSuccessMsg msg = (FmInsideOrderSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideOrderSuccessMsg.class); |
|
|
|
msg.setMsgType(wxMsgRecord.getMsgType()); |
|
|
|
msg.setReceiver(wxMsgRecord.getReceiver()); |
|
|
|
msg.setTenantId(wxMsgRecord.getTenantId()); |
|
|
|
mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); |
|
|
|
}else if(EnumMsgRecordType.INSIDE_COUPON_VERIFY.getCode().equals(wxMsgRecord.getMsgType())){ |
|
|
|
//内部消息 - 券核销 |
|
|
|
FmInsideCouponVerifyMsg msg = (FmInsideCouponVerifyMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCouponVerifyMsg.class); |
|
|
|
msg.setMsgType(wxMsgRecord.getMsgType()); |
|
|
|
msg.setReceiver(wxMsgRecord.getReceiver()); |
|
|
|
msg.setTenantId(wxMsgRecord.getTenantId()); |
|
|
|
mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(); |
|
|
|
|