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

[集团版][修改]:集团版预处理

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
8d0ea5d6cb
4 измененных файлов: 10 добавлений и 8 удалений
  1. +7
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java
  3. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java
  4. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java

+ 7
- 5
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<WxMsgRecord> 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());
}
}


+ 1
- 1
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);


+ 1
- 1
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);
}


+ 1
- 1
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);
}


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