From 2ec42a5aacea35d2918f0e17f07685cf5b4d25c8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:20:41 +0800
Subject: [PATCH] 包名引用路径更改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
index 2b7c83d..c0061fb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
@@ -459,24 +459,9 @@
data.put("selfMoney", selfMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
data.put("shareMoney", shareMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
-
BigDecimal teamMoney = new BigDecimal(0);
- if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- teamMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3, null);
- } else {
- BigDecimal bonus = null;
- BigDecimal dividend = null; // TODO 鍒嗙孩缁熻
- if (dateType == 4) { // 宸插埌璐�
- dividend = new BigDecimal(0);
- bonus = hongBaoV2CountService.geBonusByuid(uid, dateType, 3, 2);
- } else { // 鏈け鏁�
- bonus = hongBaoV2CountService.geBonusByuid(uid, dateType, 3, 4);
- }
-
- dividend = new BigDecimal(0);
- // 鎬诲洟闃熷鍔�
- teamMoney = bonus.add(dividend);
- }
+ teamMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3, null);
+
data.put("inviteMoney", teamMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
out.print(JsonUtil.loadTrueResult(data));
}
@@ -585,9 +570,6 @@
buyer = UserLevelEnum.daRen;
}
-
-
-
BigDecimal upperTotalMoney = new BigDecimal(0);
List<GoodsRebateVO> voList = new ArrayList<>();
for (HongBaoOrder hongBaoOrder : hoList) {
@@ -605,7 +587,10 @@
// 瀹炰粯娆�
BigDecimal payment = hongBaoOrder.getCommonOrder().getPayment();
- if (hongBaoOrder.getCommonOrder().getSettlement() != null)
+ // 鑻ュ凡缁撶畻 -鏄剧ず缁撶畻閲戦
+ Integer orderState = hongBaoOrder.getCommonOrder().getState();
+ if (hongBaoOrder.getCommonOrder().getSettlement() != null
+ && (orderState == CommonOrder.STATE_JS || orderState == CommonOrder.STATE_WQ))
payment = hongBaoOrder.getCommonOrder().getSettlement();
if (payment == null)
payment = new BigDecimal(0);
--
Gitblit v1.8.0