From 1151bde4c247b3801f7ab750c7abcc79a6514e10 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期六, 11 四月 2020 09:21:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 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 9251ff7..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 @@ -46,7 +46,6 @@ import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService; import com.yeshi.fanli.service.inter.hongbao.HongBaoV2SettleTempService; import com.yeshi.fanli.service.inter.money.InviteOrderSubsidyDebtService; -import com.yeshi.fanli.service.inter.money.OrderTeamRewardDebtService; import com.yeshi.fanli.service.inter.money.UserMoneyService; import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService; import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService; @@ -112,10 +111,6 @@ @Resource private HongBaoV2SettleTempService hongBaoV2SettleTempService; - - - @Resource - private OrderTeamRewardDebtService orderTeamRewardDebtService; // 涓嬬骇琚皝绂侊紝绾㈠寘澶辨晥 private void invalidHongBaoForbidden(Long id) { @@ -339,6 +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() { @@ -547,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 { @@ -845,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); @@ -943,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