From 473feb18cde724682c5fbb18bff98d654542ead5 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 25 Jun 2019 19:02:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B6=88=E6=81=AF][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=A1=A5=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/msg/WxMsgRecordController.java | 15 ++++++++++----- .../main/resources/mapper/WxMsgRecordMapper.xml | 7 ++++++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java index 860b75a63..ae3604eca 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java @@ -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,10 @@ public class WxMsgRecordController extends BaseController { * @return */ @GetMapping(value = "/resendMsg") - public ResultData resendMsg(String x) { + public ResultData resendMsg(String x, Integer msgType) { if("xll1dxx1314".equals(x)){ WxMsgRecord msgRecord = new WxMsgRecord(); + msgRecord.setMsgType(msgType); msgRecord.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode()); List recordList = wxMsgRecordService.findList(msgRecord); for (WxMsgRecord wxMsgRecord:recordList) { @@ -96,6 +94,13 @@ 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()); } } return new ResultData(); diff --git a/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml index 988a00c7f..f907f14a0 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml @@ -38,6 +38,9 @@ and `id` = #{id} + + and `tenant_id` = #{tenantId} + and `receiver_user_id` = #{receiverUserId} @@ -50,7 +53,9 @@ and `domain` = #{domain} - + + and `msg_type` = #{msgType} + order by createtime desc