From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/project/SkuDeductionVo.java | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/vo/project/SkuDeductionVo.java b/phis-feign/src/main/java/com/hz/his/vo/project/SkuDeductionVo.java
index 8243d09..643f0a1 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/project/SkuDeductionVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/project/SkuDeductionVo.java
@@ -23,14 +23,8 @@
private BigDecimal skuNumRate = BigDecimal.ZERO;
/**瀛愬崟璐拱鏁伴噺*/
private Integer buyNum = 0;
- /**瀛愬崟鐜颁环鎬婚渶瑕佹敮浠樼殑閲戦*/
+ /**瀛愬崟鐜颁环x鏁伴噺绠楀嚭鐨勬�婚噾棰�*/
private BigDecimal skuPrice = BigDecimal.ZERO;
- /**瀛愬崟鍒嗘憡绯荤粺閲戦(鍌ㄥ�奸噾+澧炲�奸噾)*/
- private BigDecimal skuSystemPrice = BigDecimal.ZERO;
- /**瀛愬崟浼樻儬閲戦*/
- private BigDecimal skuDiscountPrice = BigDecimal.ZERO;
- /**瀛愬崟鍓╀綑杩橀渶鏀粯鐨勯噾棰�*/
- private BigDecimal skuRemainingPrice = BigDecimal.ZERO;
/**瀛愬崟鍙姷鎵ｆ渶澶х幇閲戦噾棰�*/
private BigDecimal skuMaxCash = BigDecimal.ZERO;
@@ -41,14 +35,8 @@
* 璁＄畻鎶垫墸閲戦
* */
public void handlerMoney() {
- //璁＄畻鍓╀綑杩樿鏀粯鐨勯噾棰�
- this.skuRemainingPrice = this.skuPrice.subtract(this.skuSystemPrice).subtract(this.skuDiscountPrice).setScale(2, RoundingMode.HALF_UP);
//璁＄畻瀛愬崟鏈�澶у彲鎶垫墸
this.skuMaxCash = this.maxCash.multiply(new BigDecimal(this.buyNum));
- //濡傛灉Sku鏈韩璁＄畻鐨勬渶澶ф姷鎵ｇ幇閲� 澶т簬 鍓╀綑瑕佹敮浠樼殑鐜伴噾,鍙栧墿浣欒鏀粯鐨勭幇閲�
- if (this.skuMaxCash.compareTo(this.skuRemainingPrice) > 0){
- this.skuMaxCash = this.skuRemainingPrice;
- }
//榛樿璧嬪�糲ash
handlerCash(BigDecimal.ZERO);
}
--
Gitblit v1.8.0