乱七八糟折扣计算

cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java

@@ -102,6 +102,10 @@ public class CheckOrderPay implements Serializable {
      * 积分抵扣金额(tb_points_basic_setting表)
      */
     private BigDecimal pointsDiscountAmount;
+    /**
+     * 会员折扣减免金额
+     */
+    private BigDecimal vipDiscountAmount;
 
     /**
      * 使用的积分数量 (扣除各类折扣 enable_deduction后使用)
@@ -161,6 +165,10 @@ public class CheckOrderPay implements Serializable {
         return roundAmount == null ? BigDecimal.ZERO : roundAmount;
     }
 
+    public BigDecimal  getVipDiscountAmount(){
+        return vipDiscountAmount == null ? BigDecimal.ZERO : vipDiscountAmount;
+    }
+
 
     public boolean isVipPrice() {
         return vipPrice != null && vipPrice == 1;

cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java

@@ -112,6 +112,10 @@ public class OrderInfo implements Serializable {
      * 其它优惠券抵扣金额
      */
     private BigDecimal otherCouponDiscountAmount;
+    /**
+     * 会员折扣金额
+     */
+    private BigDecimal vipDiscountAmount;
 
     /**
      * 折扣金额
@@ -290,6 +294,8 @@ public class OrderInfo implements Serializable {
     private String failMsg;
 
 
+
+
     public String getRefundRemark() {
         return StrUtil.isBlank(refundRemark) ? "" : refundRemark + " ";
     }
@@ -298,6 +304,10 @@ public class OrderInfo implements Serializable {
         return newCustomerDiscountAmount == null ? BigDecimal.ZERO : newCustomerDiscountAmount;
     }
 
+    public BigDecimal getVipDiscountAmount() {
+        return vipDiscountAmount == null ? BigDecimal.ZERO : vipDiscountAmount;
+    }
+
     public BigDecimal getOriginAmount() {
         return originAmount == null ? BigDecimal.ZERO : originAmount;
     }