修改订单计算

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

@@ -2463,7 +2463,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 priceResponse.setMemberDiscount(BigDecimal.ZERO);
                 priceResponse.setTotalFee(payPrice);
                 priceResponse.setTotalFeeNow(payPrice);
-                priceResponse.setDiscount(BigDecimal.ZERO);
+//                priceResponse.setDiscount(BigDecimal.ZERO);
                 SConsumerCoupon consumerCoupon = consumerCouponService.getById(request.getCouponId());
                 computedCouponPrice(request, priceResponse, user, consumerCoupon);
                 priceResponse.setDuration(new BigDecimal(0));
@@ -2476,6 +2476,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
 
                         BigDecimal payFee = priceResponse.getPayFee();
                         BigDecimal divide = priceResponse.getPayFee().multiply(memberConfig.getDiscountRatio()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+                        if (payFee.compareTo(divide) == 0) {
+                            priceResponse.setDiscount(BigDecimal.ZERO);
+                        }
                         //总金额乘以折扣比例除以100
                         priceResponse.setPayFee(divide);
                         priceResponse.setDiscountFee(priceResponse.getTotalFee().subtract(priceResponse.getPayFee()));
@@ -2499,7 +2502,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                         }
                         priceResponse.setPayFee(totalFee);
                     }
-                    if (ObjectUtil.isEmpty(consumerWallet) && ObjectUtil.isNotEmpty(consumerMember)) {
+                    if (ObjectUtil.isEmpty(consumerWallet) && ObjectUtil.isEmpty(consumerMember)) {
                         priceResponse.setTotalFeeNow(priceResponse.getPayFee());
                         priceResponse.setMemberDiscount(priceResponse.getTotalFee().subtract(priceResponse.getPayFee()));
                     }