From c93dfa3912f0fed74faa2f5f3ef42c318a04a7a2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 13 四月 2020 11:04:14 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 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 0dc74ca..03cbab1 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
@@ -744,8 +744,7 @@
UserLevelEnum userLevel = UserLevelUtil.getByOrderRank(hongBaoV2.getUrank());
if (userLevel == null)
userLevel = UserLevelEnum.daRen;
-
- UserLevelEnum upperLevel = UserLevelUtil.getNextLevel(userLevel);
+ UserLevelEnum upperLevel = UserLevelEnum.superVIP;
BigDecimal upperTotalMoney = new BigDecimal(0);
List<GoodsRebateVO> voList = new ArrayList<>();
@@ -773,7 +772,7 @@
BigDecimal commission = orderHongBaoMoneyComputeService.computeBaseFanliMoney(commonOrder);
if (type == 3) { // 濂栭噾
- goodsVO.setBonus(hongBaoOrder.getHongBaoV2().getMoney() +"");
+ goodsVO.setBonus("楼" + hongBaoOrder.getHongBaoV2().getMoney() +"");
} else { // 浣ｉ噾
goodsVO.setCommision("楼" +commission);
}
@@ -788,10 +787,8 @@
}
voList.add(goodsVO);
- if (upperLevel != null) {
- upperTotalMoney = upperTotalMoney
- .add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));
- }
+
+ upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));
}
// 鍥㈤槦琛ヨ创
@@ -821,7 +818,7 @@
orderRebateVO.setOriginSubsidy("楼" + lowerSubsidy.setScale(2));
}
orderRebateVO.setSubsidyDesc("鍥㈤槦琛ヨ创");
- orderRebateVO.setSubsidy(teamSubsidy.setScale(2) +"");
+ orderRebateVO.setSubsidy("楼" + teamSubsidy.setScale(2) +"");
}
orderRebateVO.setType(type);
--
Gitblit v1.8.0