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 810a9a14b..e9477d62d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java @@ -103,6 +103,13 @@ public class WxMsgRecordController extends BaseController { msg.setReceiver(wxMsgRecord.getReceiver()); msg.updateTenantInfo(tenantEntity); 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.updateTenantInfo(tenantEntity); + mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } } return new ResultData(); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java index 94378c1ac..9fa7e6af0 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java @@ -7,13 +7,16 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxTemplateMsg; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.AppUniformMsg; import com.iformall.domain.po.msg.BaseMsg; +import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxTemplateMsgMapper; import com.iformall.service.msg.MsgSendService; import com.iformall.service.wechat.FmOpenService; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -30,6 +33,10 @@ import java.util.List; @Service public class SendWeappUniformMsgServiceImpl implements MsgSendService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxAppinfoMapper appinfoMapper; + @Autowired private WxTemplateMsgMapper wxTemplateMsgMapper; @@ -41,6 +48,10 @@ public class SendWeappUniformMsgServiceImpl implements MsgSendService { AppUniformMsg appUniformMsg = (AppUniformMsg)baseMsg; TenantEntity tenantEntity = appUniformMsg.getTenantInfo(); + if (StringUtils.isBlank(tenantEntity.getTenantId())) { + WxAppinfo appinfo = appinfoMapper.findByAppId(appUniformMsg.getAppId()); + tenantEntity = appinfo.getTenantInfo(); + } WxTemplateMsg msg = null; WxMaService wxMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appUniformMsg.getAppId()); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java index 860b75a63..a50a3ed8c 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java +++ b/mallinkSysAdmin/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,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();