记得上下班打卡 | git大法好,push需谨慎

Commit 641c1447 authored by jiangxiulong's avatar jiangxiulong

估算运费

parent 759f7ec0
...@@ -132,12 +132,16 @@ ...@@ -132,12 +132,16 @@
title: '快递费', title: '快递费',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var expressType = ''; var expressType = '';
var freightPrice = row.freightPrice;
if (row.expressType == 1) { if (row.expressType == 1) {
expressType = "寄付"; expressType = "寄付";
} else { } else {
expressType = "到付"; expressType = "到付";
} }
return '快递方式:'+expressType+'<br>'+'快递费:'+row.priceExpress; if (null == freightPrice) {
freightPrice = '';
}
return '快递方式:'+expressType+'<br>'+'已支付快递费:'+row.priceExpress+'<br>'+'预估快递费:'+freightPrice;
} }
}, },
{ {
......
...@@ -24,5 +24,6 @@ public class PerformanceExpressPerformanceOrderListAdminDao { ...@@ -24,5 +24,6 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
String mailno; String mailno;
Integer expressStatus; Integer expressStatus;
Integer freightPrice;
} }
...@@ -283,6 +283,7 @@ ...@@ -283,6 +283,7 @@
kots.express_type, kots.express_type,
oe.mailno, oe.mailno,
oe.freight_price,
oe.express_status oe.express_status
FROM kylin_order_tickets kot FROM kylin_order_tickets kot
INNER JOIN kylin_order_ticket_status kots ON kot.order_tickets_id = kots.order_id INNER JOIN kylin_order_ticket_status kots ON kot.order_tickets_id = kots.order_id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment