Merge branch 'refs/heads/dev' into test

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

@@ -2402,6 +2402,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()));
 //            if (priceResponse.getTotalFee().compareTo(new BigDecimal(0)) == 0) {
@@ -2417,6 +2418,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         } else {
             // 判断优惠券是否可以使用
             if (Objects.nonNull(user) && Objects.nonNull(request.getCouponId())) {
+                priceResponse.setMemberDiscount(BigDecimal.ZERO);
                 priceResponse.setTotalFee(payPrice);
                 priceResponse.setTotalFeeNow(payPrice);
                 SConsumerCoupon consumerCoupon = consumerCouponService.getById(request.getCouponId());
@@ -2428,10 +2430,14 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 if (priceResponse.getPayFee().compareTo(new BigDecimal(0)) > 0) {
                     if (ObjectUtil.isNotEmpty(consumerMember)) {
                         MemberConfig memberConfig = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>().eq(MemberConfig::getId, consumerMember.getMemberConfigId()));
-                        priceResponse.setTotalFeeNow(priceResponse.getTotalFee().multiply(memberConfig.getDiscountRatio()).divide(new BigDecimal(100)));
+
+                        BigDecimal payFee = priceResponse.getPayFee();
+                        BigDecimal divide = priceResponse.getPayFee().multiply(memberConfig.getDiscountRatio()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
                         //总金额乘以折扣比例除以100
-                        priceResponse.setPayFee(priceResponse.getPayFee().multiply(memberConfig.getDiscountRatio()).divide(new BigDecimal(100)));
+                        priceResponse.setPayFee(divide);
                         priceResponse.setDiscountFee(priceResponse.getTotalFee().subtract(priceResponse.getPayFee()));
+                        priceResponse.setTotalFeeNow(divide);
+                        priceResponse.setMemberDiscount(payFee.subtract(divide));
 //                        priceResponse.setCouponFee(priceResponse.getDiscountFee());
                         if (ObjectUtil.isNotEmpty(priceResponse.getDiscountFee()) && priceResponse.getTotalFee().compareTo(new BigDecimal(0.00)) > 0) {
                             priceResponse.setDiscountRatio(priceResponse.getDiscountFee().divide(priceResponse.getTotalFee(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)));