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/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
index 464cada..ca0bf1e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
@@ -38,7 +38,6 @@
import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.money.InviteOrderSubsidyDebtService;
-import com.yeshi.fanli.service.inter.money.OrderTeamRewardDebtService;
import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;
import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.money.UserMoneyService;
@@ -90,9 +89,6 @@
@Resource
private InviteOrderSubsidyDebtService inviteOrderSubsidyDebtService;
-
- @Resource
- private OrderTeamRewardDebtService orderTeamRewardDebtService;
@Resource
private UserMoneyDetailService userMoneyDetailService;
@@ -278,8 +274,24 @@
userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);
// 鏂扮増閫氱煡
+ List<CommonOrder> orderList = commonOrderMapper.listBySourceTypeAndOrderNo(Constant.SOURCE_TYPE_TAOBAO,
+ orderId);
+ int goodsCount = 0;
+ for (CommonOrder co : orderList) {
+ if (co.getState() != CommonOrder.STATE_SX)
+ goodsCount += co.getCount();
+ }
+
+ BigDecimal fanliMoney = new BigDecimal(0);
+ List<HongBaoOrder> hongBaoOrderList = hongBaoOrderMapper.listDetailByOrderIdAndSourceType(orderId,
+ Constant.SOURCE_TYPE_TAOBAO);
+ for (HongBaoOrder hb : hongBaoOrderList) {
+ fanliMoney = fanliMoney.add(hb.getHongBaoV2().getMoney());
+ }
+
userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO,
- drawBackMoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+ drawBackMoney, fanliMoney, goodsCount, orderList.get(0).getThirdCreateTime());
+
} else {// 璁板綍璧勯噾璁板綍锛屼絾鏄笉鏄剧ず缁欑敤鎴�
UserMoneyDetail userMoneyDetail = null;
@@ -473,9 +485,25 @@
}
}
userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);
- userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,
- userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+ // 鏂扮増閫氱煡
+ List<CommonOrder> orderList = commonOrderMapper.listBySourceTypeAndOrderNo(Constant.SOURCE_TYPE_TAOBAO,
+ orderId);
+ int goodsCount = 0;
+ for (CommonOrder co : orderList) {
+ if (co.getState() != CommonOrder.STATE_SX)
+ goodsCount += co.getCount();
+ }
+
+ BigDecimal fanliMoney = new BigDecimal(0);
+ List<HongBaoOrder> hongBaoOrderList = hongBaoOrderMapper.listDetailByOrderIdAndSourceType(orderId,
+ Constant.SOURCE_TYPE_TAOBAO);
+ for (HongBaoOrder hb : hongBaoOrderList) {
+ fanliMoney = fanliMoney.add(hb.getHongBaoV2().getMoney());
+ }
+
+ userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,
+ fanliMoney, goodsCount, orderList.get(0).getThirdCreateTime());
}
}
@@ -600,10 +628,9 @@
throw new TaoBaoWeiQuanException(101, "閭�璇疯鍗曡ˉ璐村紓甯�");
}
- //TODO 鍒犻櫎鍥㈤槦濂栧姳缁存潈澶勭悊
+ // TODO 鍒犻櫎鍥㈤槦濂栧姳缁存潈澶勭悊
}
}
-
@Override
public TaoBaoWeiQuanDrawBack selectByOrderItemId(String orderItemId) {
--
Gitblit v1.8.0