订单显示优惠券金额

platform-admin/src/main/java/com/platform/vo/OrderBasicVo.java

@@ -33,6 +33,16 @@ public class OrderBasicVo implements Serializable {
     private Date updateTime;
     private BigDecimal itemsPrice;
 
+    private BigDecimal couponPrice;
+
+    public BigDecimal getCouponPrice() {
+        return couponPrice;
+    }
+
+    public void setCouponPrice(BigDecimal couponPrice) {
+        this.couponPrice = couponPrice;
+    }
+
     private Integer orderSource;
 
     public BigDecimal getItemsPrice() {

platform-admin/src/main/resources/com/platform/dao/TbCfOrderListDao.xml

@@ -191,7 +191,8 @@
 		o.order_status,
 		o.remark_info,
 		o.update_time,
-		o.order_source
+		o.order_source,
+		o.coupon_price
 		from tb_cf_order o
 		LEFT JOIN tb_cf_finance f on f.order_id=o.order_id
 		LEFT JOIN tb_cf_coupon c on c.coupon_id=o.coupon_id

platform-admin/src/main/resources/dev/platform.properties

@@ -7,7 +7,7 @@
 #jdbc.password=diaoyun666
 
 
-jdbc.url: jdbc:mysql://159.138.48.71:3306/test?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
 jdbc.username: root
 jdbc.password: Diaoyunnuli.8
 

platform-admin/src/main/resources/prod/platform.properties

@@ -7,7 +7,7 @@
 #jdbc.password=diaoyun666
 
 
-jdbc.url: jdbc:mysql://159.138.48.71:3306/test?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
 jdbc.username: root
 jdbc.password: Diaoyunnuli.8
 

platform-admin/src/main/webapp/js/sys/tbcforderList.js

@@ -882,7 +882,8 @@ let vm = new Vue({
                     vm.costData[1].constnum = r.orderBasicVo.expressCost;
                     vm.costData[2].constnum = r.orderBasicVo.tax;
                     vm.costData[3].constnum = r.orderBasicVo.fee;
-                    vm.costData[4].constnum = r.orderBasicVo.couponId;
+                    // vm.costData[4].constnum = r.orderBasicVo.couponId;
+                    vm.costData[4].constnum = r.orderBasicVo.couponPrice;
                     vm.costData[6].constnum = r.orderBasicVo.couponTitle;
                     vm.costData[7].constnum = r.orderBasicVo.realityPay;
                 }