From 8d0ea5d6cba02ad258d0c7bfcdb52e0d37b84201 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 1 Nov 2019 00:15:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9B=86=E5=9B=A2=E7=89=88][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E9=9B=86=E5=9B=A2=E7=89=88=E9=A2=84=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/msg/WxMsgRecordController.java | 12 +++++++----- .../controller/rent/WxBillDailyController.java | 2 +- .../controller/rent/WxBillOtherController.java | 2 +- .../rent/WxBillOtherDepositController.java | 2 +- 4 files changed, 10 insertions(+), 8 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 f942a8e37..810a9a14b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java @@ -2,6 +2,7 @@ package com.iformall.controller.msg; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.*; import com.iformall.enums.*; import com.iformall.mapper.WxMsgMapper; @@ -64,9 +65,10 @@ public class WxMsgRecordController extends BaseController { public ResultData resendMsg(String x, Integer msgType) { logger.debug("[" + getIpAddr() + "] WxMsgRecordController::resendMsg"); if("xll1dxx1314".equals(x)){ + TenantEntity tenantEntity = getTenantInfo(); WxMsgRecord msgRecord = new WxMsgRecord(); msgRecord.setMsgType(msgType); - msgRecord.updateTenantInfo(getTenantInfo()); + msgRecord.updateTenantInfo(tenantEntity); msgRecord.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode()); List recordList = wxMsgRecordService.findList(msgRecord); for (WxMsgRecord wxMsgRecord:recordList) { @@ -78,28 +80,28 @@ public class WxMsgRecordController extends BaseController { WxMsg wxMsg = (WxMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),WxMsg.class); wxMsg.setMsgType(wxMsgRecord.getMsgType()); wxMsg.setReceiver(wxMsgRecord.getReceiver()); - wxMsg.setTenantId(wxMsgRecord.getTenantId()); + wxMsg.updateTenantInfo(tenantEntity); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); }else if(EnumMsgRecordType.EMAIL.getCode().equals(wxMsgRecord.getMsgType())){ //邮件 MailMsg wxMsg = (MailMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),MailMsg.class); wxMsg.setMsgType(wxMsgRecord.getMsgType()); wxMsg.setReceiver(wxMsgRecord.getReceiver()); - wxMsg.setTenantId(wxMsgRecord.getTenantId()); + wxMsg.updateTenantInfo(tenantEntity); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); }else if(EnumMsgRecordType.SMART_APP.getCode().equals(wxMsgRecord.getMsgType())){ //微信小程序 SmartAppMsg wxMsg = (SmartAppMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),SmartAppMsg.class); wxMsg.setMsgType(wxMsgRecord.getMsgType()); wxMsg.setReceiver(wxMsgRecord.getReceiver()); - wxMsg.setTenantId(wxMsgRecord.getTenantId()); + wxMsg.updateTenantInfo(tenantEntity); 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()); + msg.updateTenantInfo(tenantEntity); mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index 857326d18..24bb07d66 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -74,7 +74,7 @@ public class WxBillDailyController extends BaseController { public ResultData add(@RequestBody WxBillDaily wxBillDaily) { logger.debug("[" + getIpAddr() + "] WxBillDailyController::add"); MallUserInfo user = getUser(); - wxBillDaily.setTenantId(user.getTenantId()); + wxBillDaily.updateTenantInfo(user); wxBillDaily.setUserId(user.getId()); wxBillDaily.setBuildWay(EnumBillDailyBuildWay.HAND.getCode()); return wxBillDailyService.saveOrUpdate(wxBillDaily, user); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java index cc62a9ea7..6b78b4066 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -50,7 +50,7 @@ public class WxBillOtherController extends BaseController { public ResultData add(@RequestBody WxBillOther wxBillOther) { logger.debug("[" + getIpAddr() + "] WxBillOtherController::add"); MallUserInfo user = getUser(); - wxBillOther.setTenantId(user.getTenantId()); + wxBillOther.updateTenantInfo(user); wxBillOther.setUserId(user.getId()); return wxBillOtherService.saveOrUpdate(wxBillOther, user); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java index 76cf153b6..3ef056a00 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -50,7 +50,7 @@ public class WxBillOtherDepositController extends BaseController { public ResultData add(@RequestBody WxBillOtherDeposit wxBillOtherDeposit) { logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::add"); MallUserInfo user = getUser(); - wxBillOtherDeposit.setTenantId(user.getTenantId()); + wxBillOtherDeposit.updateTenantInfo(user); wxBillOtherDeposit.setUserId(user.getId()); return wxBillOtherDepositService.saveOrUpdate(wxBillOtherDeposit, user); }