修改计算订单价格,增加用户钱包计算

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -52,6 +52,7 @@ import share.system.service.*;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.*;
@@ -1927,7 +1928,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         if (ObjectUtil.isNull(request.getCouponId()) || request.getCouponId() <= 0) {
             priceResponse.setCouponFee(BigDecimal.ZERO);
             priceResponse.setDiscountFee(priceResponse.getTotalFee().subtract(priceResponse.getPayFee()));
-            priceResponse.setDiscountRatio(priceResponse.getDiscountFee().divide(priceResponse.getTotalFee()).multiply(new BigDecimal(100)));
+            priceResponse.setDiscountRatio(priceResponse.getDiscountFee().divide(priceResponse.getTotalFee(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)));
             if (ObjectUtil.isNotEmpty(consumerMember)) {
                 MemberConfig memberConfig = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>().eq(MemberConfig::getId, consumerMember.getMemberConfigId()));
                 //总金额乘以折扣比例除以100
@@ -1935,7 +1936,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 priceResponse.setDiscountFee(priceResponse.getTotalFee().subtract(priceResponse.getPayFee()));
                 priceResponse.setCouponFee(priceResponse.getDiscountFee());
                 if (ObjectUtil.isNotEmpty(priceResponse.getDiscountFee()) && priceResponse.getTotalFee().compareTo(new BigDecimal(0.00)) > 0) {
-                    priceResponse.setDiscountRatio(priceResponse.getDiscountFee().divide(priceResponse.getTotalFee()).multiply(new BigDecimal(100)));
+                    priceResponse.setDiscountRatio(priceResponse.getDiscountFee().divide(priceResponse.getTotalFee(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)));
                 } else {
                     priceResponse.setDiscountRatio(new BigDecimal(0));
                 }
@@ -1966,9 +1967,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     priceResponse.setRemainingBalance(consumerWallet.getBalance().subtract(remainingBalance));
                     totalFee = new BigDecimal(0);
                 } else if (consumerWallet.getBalance().compareTo(remainingBalance) < 0) {
-                    priceResponse.setBalance(remainingBalance.subtract(consumerWallet.getBalance()));
-                    priceResponse.setTotalFee(remainingBalance.subtract(consumerWallet.getBalance()));
-                    priceResponse.setPayFee(remainingBalance.subtract(consumerWallet.getBalance()));
+                    priceResponse.setBalance(consumerWallet.getBalance());
                     totalFee = remainingBalance.subtract(consumerWallet.getBalance());
                 }
             }