From a331c3be6000d3c81f88e0a564e2db63da99018b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 21 May 2025 10:33:42 +0800
Subject: [PATCH] feat(score): 初始化积分设置页面的默认值
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 5fdf95f..0647d39 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -477,7 +477,7 @@
if (MallGoodsCoupon.TYPE_ONE == type) {
realAmount = mallGoodsCoupon.getRealAmount();
} else if (MallGoodsCoupon.TYPE_TWO == type) {
- BigDecimal divideTime = totalAmount.divide(costAmount, 0, RoundingMode.DOWN); // 累计减免次数
+ BigDecimal divideTime = totalAmount.divide(costAmount, 0, RoundingMode.HALF_DOWN); // 累计减免次数
realAmount = divideTime.multiply(realAmount); // 实际减免金额
}
@@ -489,17 +489,17 @@
for (Map.Entry<Long, BigDecimal> entry : skuMap.entrySet()) {
Long keySkuId = entry.getKey();
BigDecimal valueSkuAmount = entry.getValue();
- BigDecimal divide = valueSkuAmount.divide(totalAmount, 4, RoundingMode.DOWN); // 每个商品占符合满减的总额的比例
+ BigDecimal divide = valueSkuAmount.divide(totalAmount, 4, RoundingMode.HALF_DOWN); // 每个商品占符合满减的总额的比例
BigDecimal skuRealAmount = BigDecimal.ZERO;
if (MallGoodsCoupon.TYPE_ONE == type) {
- BigDecimal bigDecimalOne = realAmount.multiply(divide).setScale(2, RoundingMode.DOWN); // 每个SKU的减免金额(比例*减免金额)
- skuRealAmount = valueSkuAmount.subtract(bigDecimalOne.max(BigDecimal.ZERO)).setScale(2, RoundingMode.DOWN);
+ BigDecimal bigDecimalOne = realAmount.multiply(divide).setScale(2, RoundingMode.HALF_DOWN); // 每个SKU的减免金额(比例*减免金额)
+ skuRealAmount = valueSkuAmount.subtract(bigDecimalOne.max(BigDecimal.ZERO)).setScale(2, RoundingMode.HALF_DOWN);
totalDiscount = totalDiscount.add(bigDecimalOne);
} else if (MallGoodsCoupon.TYPE_TWO == type) {
- BigDecimal divideTime = totalAmount.divide(costAmount, 0, RoundingMode.DOWN); // 累计减免次数
+ BigDecimal divideTime = totalAmount.divide(costAmount, 0, RoundingMode.HALF_DOWN); // 累计减免次数
BigDecimal multiply = divideTime.multiply(realAmount); // 实际减免金额
- BigDecimal bigDecimalTwo = multiply.multiply(divide).setScale(2, RoundingMode.DOWN); // 每个SKU的减免金额(比例*实际减免金额)
- skuRealAmount = valueSkuAmount.subtract(bigDecimalTwo.max(BigDecimal.ZERO)).setScale(2, RoundingMode.DOWN);
+ BigDecimal bigDecimalTwo = multiply.multiply(divide).setScale(2, RoundingMode.HALF_DOWN); // 每个SKU的减免金额(比例*实际减免金额)
+ skuRealAmount = valueSkuAmount.subtract(bigDecimalTwo.max(BigDecimal.ZERO)).setScale(2, RoundingMode.HALF_DOWN);
totalDiscount = totalDiscount.add(bigDecimalTwo);
}
couponAmountMap.put(keySkuId, skuRealAmount);
@@ -511,7 +511,7 @@
for (Map.Entry<Long, BigDecimal> entry : couponAmountMap.entrySet()) {
Long keySkuId = entry.getKey();
BigDecimal skuRealAmount = entry.getValue();
- BigDecimal newSkuRealAmount = skuRealAmount.subtract(difference).setScale(2, RoundingMode.DOWN);
+ BigDecimal newSkuRealAmount = skuRealAmount.subtract(difference).setScale(2, RoundingMode.HALF_DOWN);
couponAmountMap.put(keySkuId, newSkuRealAmount);
break; // 调整最后一个商品的减免金额
}
@@ -1086,6 +1086,7 @@
if(CollUtil.isEmpty(mallOrderItemList)){
return new FebsResponse().fail().message("订单不存在");
}
+ int i = 0;
for(MallOrderItem mallOrderItem : mallOrderItemList){
QueryWrapper<MallRefundEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("member_id",member.getId());
@@ -1106,7 +1107,11 @@
mallRefundEntity.setType(3);
}
mallRefundEntity.setState(3);
- mallRefundEntity.setAmount(mallOrderItem.getAmount());
+ if(i == 0){
+ mallRefundEntity.setAmount(mallOrderItem.getAmount().add(mallOrderInfo.getCarriage()));
+ }else{
+ mallRefundEntity.setAmount(mallOrderItem.getAmount());
+ }
mallRefundMapper.insert(mallRefundEntity);
}else{
if(mallRefund.getState() == 1){
@@ -1129,6 +1134,7 @@
apiLeaderRefundOrderDto.setItemId(mallOrderItem.getId());
apiLeaderRefundOrderDto.setAgreeState(1);
iApiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);
+ i++;
}
return new FebsResponse().success();
}
--
Gitblit v1.9.1