|
|
@@ -884,10 +884,10 @@
|
|
|
cso.orderNo AS orderNo,
|
|
|
cso.orderID AS orderID,
|
|
|
co.payTotalFee AS orderAmount,
|
|
|
- co.payableAmount AS payableAmount,
|
|
|
+ ifnull(co.payableAmount, 0) AS payableAmount,
|
|
|
co.onlinePayFlag,
|
|
|
- cso.receiptAmount AS receiptAmount,
|
|
|
- cso.accountAmount AS accountAmount,
|
|
|
+ ifnull(cso.receiptAmount, 0) AS receiptAmount,
|
|
|
+ ifnull(cso.accountAmount, 0) AS accountAmount,
|
|
|
-- (select
|
|
|
-- sum(o.needPayAmount)
|
|
|
-- from cm_receipt_order_relation cror
|
|
|
@@ -904,9 +904,9 @@
|
|
|
co.userID AS userID,
|
|
|
cso.shopOrderNo AS shopOrderNo,
|
|
|
cso.shopOrderID AS shopOrderID,
|
|
|
- cso.needPayAmount AS shopOrderAmount,
|
|
|
- cso.shouldPayShopAmount AS shouldPayShopAmount,
|
|
|
- cso.payedShopAmount AS payedShopAmount,
|
|
|
+ ifnull(cso.needPayAmount, 0) AS shopOrderAmount,
|
|
|
+ ifnull(cso.shouldPayShopAmount, 0) AS shouldPayShopAmount,
|
|
|
+ ifnull(cso.payedShopAmount, 0) AS payedShopAmount,
|
|
|
s.name AS shopName
|
|
|
from cm_shop_order cso
|
|
|
left join cm_order co on cso.orderID = co.orderID
|
