From 99f131731d056d3d2f7d4b20e0d2578f57602362 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 11:06:51 +0800
Subject: [PATCH] 消息调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 ddc9f07..03cc71b 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
@@ -742,7 +742,7 @@
}
}
orderRebateVO.setFanLiDesc(predictDesc + typeName);
- orderRebateVO.setFanLi("楼" + hongBao.setScale(2));
+ orderRebateVO.setFanLi("楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN));
HongBaoV2 hongBaoV2 = hoList.get(0).getHongBaoV2();
UserLevelEnum userLevel = UserLevelUtil.getByOrderRank(hongBaoV2.getUrank());
@@ -771,7 +771,7 @@
payment = hongBaoOrder.getCommonOrder().getSettlement();
if (payment == null)
payment = new BigDecimal(0);
- goodsVO.setActualPay("楼" + payment.setScale(2));
+ goodsVO.setActualPay("楼" + payment.setScale(2, BigDecimal.ROUND_DOWN));
BigDecimal commission = orderHongBaoMoneyComputeService.computeBaseFanliMoney(commonOrder);
if (type == 3) { // 濂栭噾
@@ -782,11 +782,11 @@
// 骞冲彴琛ヨ创
BigDecimal vipFanli = hongBaoOrder.getHongBaoV2().getMoney();
- goodsVO.setSubsidy("楼" + vipFanli.subtract(commission).setScale(2));
+ goodsVO.setSubsidy("楼" + vipFanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN));
// 杈句汉琛ヨ创
if (userLevel != UserLevelEnum.daRen) {
BigDecimal darenFanli = orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, UserLevelEnum.daRen);
- goodsVO.setOriginSubsidy("楼" + darenFanli.subtract(commission).setScale(2) + "");
+ goodsVO.setOriginSubsidy("楼" + darenFanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN) + "");
}
voList.add(goodsVO);
@@ -818,10 +818,10 @@
}
if (userLevel != UserLevelEnum.daRen) {
- orderRebateVO.setOriginSubsidy("楼" + lowerSubsidy.setScale(2));
+ orderRebateVO.setOriginSubsidy("楼" + lowerSubsidy.setScale(2, BigDecimal.ROUND_DOWN));
}
orderRebateVO.setSubsidyDesc("鍥㈤槦琛ヨ创");
- orderRebateVO.setSubsidy("楼" + teamSubsidy.setScale(2) +"");
+ orderRebateVO.setSubsidy("楼" + teamSubsidy.setScale(2, BigDecimal.ROUND_DOWN) +"");
}
orderRebateVO.setType(type);
@@ -867,7 +867,7 @@
orderRebateVO.setCouponType(1);
orderRebateVO.setCouponUse(true);
orderRebateVO.setCouponText("濂栧姳鎴愬姛");
- orderRebateVO.setCouponDesc("宸插啀杩斅�" +couponMoney.setScale(2));
+ orderRebateVO.setCouponDesc("宸插啀杩斅�" +couponMoney.setScale(2, BigDecimal.ROUND_DOWN));
orderRebateVO.setCouponParams(params.toString());
orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
} else if (freeState > 0) { // 宸蹭娇鐢ㄥ厤鍗曞埜
--
Gitblit v1.8.0