Sfoglia il codice sorgente

订单优惠券金额bugfix

chao 3 anni fa
parent
commit
46c1bc181c

+ 4 - 0
src/main/java/com/caimei365/order/model/vo/OrderVo.java

@@ -151,6 +151,10 @@ public class OrderVo implements Serializable {
      * 经理折扣
      */
     private Double discountFee;
+    /**
+     * 使用优惠券金额
+     */
+    private Double couponAmount;
     /**
      * 订单总额(小计金额减去经理折扣后,再加上运费)
      */

+ 6 - 1
src/main/resources/mapper/OrderClubMapper.xml

@@ -156,6 +156,8 @@
             payTotalFee,
             payableAmount,
             balancePayFee,
+            discountFee,
+            couponAmount,
             status,
             confirmTime,
             payTime,
@@ -268,10 +270,11 @@
             freight AS postage,
             productTotalFee,
             orderTotalFee,
-            discountFee,
             payTotalFee,
             payableAmount,
             balancePayFee,
+            discountFee,
+            couponAmount,
             status,
             confirmTime,
             payTime,
@@ -345,6 +348,8 @@
         co.payTotalFee,
         co.payableAmount,
         co.balancePayFee,
+        co.discountFee,
+        co.couponAmount,
         co.status,
         co.confirmTime,
         co.payTime,

+ 6 - 0
src/main/resources/mapper/OrderSellerMapper.xml

@@ -46,6 +46,8 @@
         payTotalFee,
         payableAmount,
         balancePayFee,
+        discountFee,
+        couponAmount,
         status,
         confirmTime,
         payTime,
@@ -124,6 +126,8 @@
         payTotalFee,
         payableAmount,
         balancePayFee,
+        discountFee,
+        couponAmount,
         status,
         confirmTime,
         payTime,
@@ -196,6 +200,8 @@
         co.payTotalFee,
         co.payableAmount,
         co.balancePayFee,
+        co.discountFee,
+        co.couponAmount,
         co.status,
         co.confirmTime,
         co.payTime,