估算运费

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html

@@ -132,12 +132,16 @@
                     title: '快递费',
                     formatter: function (value, row, index) {
                         var expressType = '';
+                        var freightPrice = row.freightPrice;
                         if (row.expressType == 1) {
                             expressType = "寄付";
                         } else {
                             expressType = "到付";
                         }
-                        return '快递方式：'+expressType+'<br>'+'快递费：'+row.priceExpress;
+                        if (null == freightPrice) {
+                            freightPrice = '';
+                        }
+                        return '快递方式：'+expressType+'<br>'+'已支付快递费：'+row.priceExpress+'<br>'+'预估快递费：'+freightPrice;
                     }
                 },
                 {

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceExpressPerformanceOrderListAdminDao.java

@@ -24,5 +24,6 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
 
     String mailno;
     Integer expressStatus;
+    Integer freightPrice;
 
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -283,6 +283,7 @@
         kots.express_type,
 
         oe.mailno,
+        oe.freight_price,
         oe.express_status
         FROM kylin_order_tickets kot
         INNER JOIN kylin_order_ticket_status kots ON kot.order_tickets_id = kots.order_id