fixed 支付明细显示优化

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -2123,17 +2123,18 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         }
 
         // 会员折扣
-        BigDecimal payDiscount = new BigDecimal("1");
+        BigDecimal memberDiscount = new BigDecimal("1");
         MtUserGrade userGrade = userGradeService.queryUserGradeById(merchantId, Integer.parseInt(userInfo.getGradeId()), userInfo.getId());
         if (userGrade != null && !userInfo.getIsStaff().equals(YesOrNoEnum.YES.getKey())) {
             if (userGrade.getDiscount() > 0) {
-                payDiscount = new BigDecimal(userGrade.getDiscount()).divide(new BigDecimal("10"), BigDecimal.ROUND_CEILING, 4);
-                if (payDiscount.compareTo(new BigDecimal("0")) <= 0) {
-                    payDiscount = new BigDecimal("1");
+                memberDiscount = new BigDecimal(userGrade.getDiscount()).divide(new BigDecimal("10"), BigDecimal.ROUND_CEILING, 4);
+                if (memberDiscount.compareTo(new BigDecimal("0")) <= 0) {
+                    memberDiscount = new BigDecimal("1");
                 }
             }
         }
-        payPrice = payPrice.multiply(payDiscount).add(deliveryFee);
+        payPrice = payPrice.multiply(memberDiscount).add(deliveryFee);
+        BigDecimal discount = totalPrice.subtract(payPrice).divide(new BigDecimal("10"), BigDecimal.ROUND_CEILING, 2);
 
         result.put("list", cartDtoList);
         result.put("totalNum", totalNum);
@@ -2146,6 +2147,8 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         result.put("couponAmount", couponAmount);
         result.put("usePointAmount", usePointAmount);
         result.put("deliveryFee", deliveryFee);
+        result.put("discount", discount);
+        result.put("memberDiscount", (new BigDecimal("10").multiply(memberDiscount)));
 
         return result;
     }

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCartController.java

@@ -228,6 +228,8 @@ public class ClientCartController extends BaseController {
         result.put("useCouponInfo", null);
         result.put("deliveryFee", 0);
         result.put("payPrice", 0);
+        result.put("discount", 0);
+        result.put("memberDiscount", 0);
 
         Map<String, Object> param = new HashMap<>();
         UserInfo userInfo = TokenUtil.getUserInfoByToken(token);