From a38cc332973adbd296c37f64c2b2ca1a6ffb5c41 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 23 四月 2020 14:23:53 +0800
Subject: [PATCH] 删除订单补贴欠款相关代码
---
fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java | 44 +++++---------------------------------------
1 files changed, 5 insertions(+), 39 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 3ad78c1..bb92104 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
@@ -30,12 +30,10 @@
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;
import com.yeshi.fanli.exception.user.UserAccountException;
-import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
@@ -153,31 +151,8 @@
}
}
- if (hasAdd) {
- try {
- inviteOrderSubsidyService.addOrUpdateByOrder(orderId, orderType);
- } catch (InviteOrderSubsidyException e) {
- throw new HongBaoException(201, "娣诲姞琛ヨ创鍑洪敊");
- } catch (CommonOrderException e) {
- throw new HongBaoException(202, "娣诲姞琛ヨ创鍑洪敊");
- }
- }
-
+
int state = getOrderState(stateSet);
-
- if (hasAdd || hasUpdate) {
- // 琛ヨ创澶辨晥
- if (state == CommonOrder.STATE_SX)
- inviteOrderSubsidyService.invalidByOrderIdAndSourceType(orderId, orderType);
- else
- try {
- inviteOrderSubsidyService.addOrUpdateByOrder(orderId, orderType);
- } catch (InviteOrderSubsidyException e) {
- LogHelper.errorDetailInfo(e, "娣樺疂璁㈠崟琛ヨ创鏇存柊澶辫触", orderId);
- } catch (CommonOrderException e) {
- LogHelper.errorDetailInfo(e, "娣樺疂璁㈠崟琛ヨ创鏇存柊澶辫触", orderId);
- }
- }
/**
* 閫氱煡鐢ㄦ埛鐨勮繑鍒╂儏鍐�
@@ -194,15 +169,6 @@
CommonOrder commonOrder = notificationMap.get(t).getCommonOrder();
Long uid = notify.getUserInfo().getId();
- 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:
@@ -218,27 +184,27 @@
break;
case HongBaoV2.TYPE_YIJI:
userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, subsidy, goodsCount, state,
+ commonOrder.getPayment(), money, new BigDecimal(0), goodsCount, state,
commonOrder.getThirdCreateTime());
break;
case HongBaoV2.TYPE_ERJI:
userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, subsidy, goodsCount, state,
+ commonOrder.getPayment(), money, new BigDecimal(0), goodsCount, state,
commonOrder.getThirdCreateTime());
break;
case HongBaoV2.TYPE_SHARE_YIJI:
userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, subsidy, goodsCount, state,
+ commonOrder.getPayment(), money, new BigDecimal(0), goodsCount, state,
commonOrder.getThirdCreateTime());
break;
case HongBaoV2.TYPE_SHARE_ERJI:
userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, subsidy, goodsCount, state,
+ commonOrder.getPayment(), money, new BigDecimal(0), goodsCount, state,
commonOrder.getThirdCreateTime());
break;
--
Gitblit v1.8.0