|
|
@@ -1279,7 +1279,7 @@
|
|
|
s.name AS shopName,
|
|
|
(SELECT SUM(cmCostPrice*(num+presentnum) )FROM cm_order_product WHERE shopOrderId = cso.shopOrderId) AS cmCostPrice,
|
|
|
(select userName from user where userID = cso.userId LIMIT 1) as userName,
|
|
|
- (select sum(associateAmount) from cm_receipt_order_relation where shopOrderID = cso.shopOrderID) as receiptAmount,
|
|
|
+ (select sum(associateAmount) from cm_receipt_order_relation where shopOrderID = cso.shopOrderID and relationType !=7) as receiptAmount,
|
|
|
IFNULL((SELECT SUM(refundAmount)
|
|
|
FROM cm_refund_shop_record
|
|
|
WHERE shopOrderID = cso.shopOrderID
|
|
|
@@ -1326,7 +1326,7 @@
|
|
|
ifnull(cso.orderStatusFlag,1) as orderStatusFlag,
|
|
|
IFNULL(cso.refundStatus, 1) AS refundStatus,
|
|
|
(select userName from user where userID = cso.userId LIMIT 1) as userName,
|
|
|
- (select sum(associateAmount) from cm_receipt_order_relation where shopOrderID = cso.shopOrderID) as receiptAmount,
|
|
|
+ (select sum(associateAmount) from cm_receipt_order_relation where shopOrderID = cso.shopOrderID and relationType !=7) as receiptAmount,
|
|
|
ifnull(cso.sendOutStatus, 1) as sendOutStatus,
|
|
|
ifnull(cso.receiptStatus, 1) as receiptStatus,
|
|
|
cso.splitFlag,
|
zhijiezhao