From d960fdbfe07a65cb80ccb764bfb15ce78ebfd84a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 10 四月 2020 18:21:04 +0800
Subject: [PATCH] 消息修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
index 75034f4..88133fd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
@@ -334,7 +334,7 @@
Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderFanLiActual, mqMsg);
String taskKey = getTaskKey(uid);
msg.setKey(taskKey);
-
+
// 娣诲姞浜嬪姟娑堟伅
try {
orderTransactionProducer.send(msg, new LocalTransactionExecuter() {
@@ -543,8 +543,9 @@
UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
// 鏂扮増閫氱煡
+
userMoneyMsgNotificationService.fanliOrderReceived(uid, orderId, sourceType, userGoodsCount.get(uid), money,
- user.getMyHongBao());
+ user.getMyHongBao(), orderList.get(0).getThirdCreateTime());
}
// 閫氱煡鍏嶅崟鍒拌处
try {
@@ -841,7 +842,8 @@
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),
- shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());
+ shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), null,
+ null);
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);
@@ -939,8 +941,8 @@
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),
- shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());
-
+ shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), null,
+ null);
}
hongBaoV2SettleTempService.addTemp(recieveHongBaoIds, key);
--
Gitblit v1.8.0