From b907ba5b12a98e31d56c8847769875906a682b98 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 16:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java | 107 +++++++++++++++++++++++++++++------------------------
1 files changed, 59 insertions(+), 48 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
index cdf0ecb..d1528e1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
@@ -26,6 +26,7 @@
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.HongBaoOrder;
+import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.exception.order.HongBaoException;
import com.yeshi.fanli.exception.order.InviteOrderSubsidyException;
@@ -171,59 +172,69 @@
* 閫氱煡鐢ㄦ埛鐨勮繑鍒╂儏鍐�
*/
- if (!Constant.IS_TEST) {
- if (hasAdd) {
- Iterator<Integer> its = notificationMap.keySet().iterator();
- while (its.hasNext()) {
- Integer t = its.next();
- HongBaoV2 notify = notificationMap.get(t).getHongBaoV2();
- CommonOrder commonOrder = notificationMap.get(t).getCommonOrder();
- Long uid = notify.getUserInfo().getId();
- BigDecimal money = notify.getMoney();
- switch (t) {
- case HongBaoV2.TYPE_ZIGOU:
- userOrderMsgNotificationService.orderFanLiStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, goodsCount, state,
- commonOrder.getThirdCreateTime());
+ // if (!Constant.IS_TEST) {
+ if (hasAdd) {
+ // 鑾峰彇璁㈠崟琛ヨ创
- break;
- case HongBaoV2.TYPE_SHARE_GOODS:
+ Iterator<Integer> its = notificationMap.keySet().iterator();
+ while (its.hasNext()) {
+ Integer t = its.next();
+ HongBaoV2 notify = notificationMap.get(t).getHongBaoV2();
+ CommonOrder commonOrder = notificationMap.get(t).getCommonOrder();
+ Long uid = notify.getUserInfo().getId();
- userOrderMsgNotificationService.orderShareStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, goodsCount, state,
- commonOrder.getThirdCreateTime());
-
- break;
- case HongBaoV2.TYPE_YIJI:
- userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, goodsCount, state,
- commonOrder.getThirdCreateTime());
-
- break;
- case HongBaoV2.TYPE_ERJI:
-
- userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, goodsCount, state,
- commonOrder.getThirdCreateTime());
-
- break;
-
- case HongBaoV2.TYPE_SHARE_YIJI:
- userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, goodsCount, state,
- commonOrder.getThirdCreateTime());
- break;
- case HongBaoV2.TYPE_SHARE_ERJI:
-
- userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, goodsCount, state,
- commonOrder.getThirdCreateTime());
-
- break;
-
+ List<InviteOrderSubsidy> subsidyList = inviteOrderSubsidyService.listByOrderNoAndTypeAndUid(orderId,
+ orderType, uid);
+ BigDecimal subsidy = new BigDecimal(0);
+ if (subsidyList != null)
+ for (InviteOrderSubsidy s : subsidyList) {
+ if (s.getState() != InviteOrderSubsidy.STATE_INVALID)
+ subsidy = subsidy.add(s.getOriginalMoney());
}
+
+ BigDecimal money = notify.getMoney();
+ switch (t) {
+ case HongBaoV2.TYPE_ZIGOU:
+ userOrderMsgNotificationService.orderFanLiStatistic(uid, orderId, orderType,
+ commonOrder.getPayment(), money, goodsCount, state, commonOrder.getThirdCreateTime());
+
+ break;
+ case HongBaoV2.TYPE_SHARE_GOODS:
+
+ userOrderMsgNotificationService.orderShareStatistic(uid, orderId, orderType,
+ commonOrder.getPayment(), money, goodsCount, state, commonOrder.getThirdCreateTime());
+
+ break;
+ case HongBaoV2.TYPE_YIJI:
+ userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
+ commonOrder.getPayment(), money, subsidy, goodsCount, state,
+ commonOrder.getThirdCreateTime());
+
+ break;
+ case HongBaoV2.TYPE_ERJI:
+
+ userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
+ commonOrder.getPayment(), money, subsidy, goodsCount, state,
+ commonOrder.getThirdCreateTime());
+
+ break;
+
+ case HongBaoV2.TYPE_SHARE_YIJI:
+ userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
+ commonOrder.getPayment(), money, subsidy, goodsCount, state,
+ commonOrder.getThirdCreateTime());
+ break;
+ case HongBaoV2.TYPE_SHARE_ERJI:
+
+ userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
+ commonOrder.getPayment(), money, subsidy, goodsCount, state,
+ commonOrder.getThirdCreateTime());
+
+ break;
+
}
}
+ // }
}
int resultCode = 0;
--
Gitblit v1.8.0