bugfix

src/main/resources/mapper/ReceiptMapper.xml

@@ -1284,9 +1284,9 @@
                         ifnull(cso.orderStatusFlag, 1)                                as orderStatusFlag,
                         IFNULL(cso.refundStatus, 1)                                   AS refundStatus,
                         s.name                                                        AS shopName,
-                        (SELECT SUM(cmCostPrice * (num + presentnum))
-                         FROM cm_order_product
-                         WHERE shopOrderId = cso.shopOrderId)                         AS cmCostPrice,
+                        (select ifnull(sum(cop.cmCostPrice * cop.num), 0) +
+                        IF(cso.rebateOrder = 1 ,IFNULL(cso.shopPostFee,0)- IFNULL(cso.supplierFreight,0),0)
+                        from cm_order_product cop where cop.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
@@ -1345,8 +1345,9 @@
         cso.splitFlag,
         cso.shopOtherFee,
         s.name AS shopName,
-        (SELECT SUM(cmCostPrice*(num+presentnum) )FROM cm_order_product WHERE shopOrderId = cso.shopOrderId) AS
-        cmCostPrice,
+        (select ifnull(sum(cop.cmCostPrice * cop.num), 0) +
+        IF(cso.rebateOrder = 1 ,IFNULL(cso.shopPostFee,0)- IFNULL(cso.supplierFreight,0),0)
+        from cm_order_product cop where cop.shopOrderID = cso.shopOrderId) AS cmCostPrice,
         IF((SELECT (crpp.id) FROM cm_returned_purchase_product crpp LEFT JOIN cm_returned_purchase crp ON crp.id =
         crpp.returnedID
         WHERE crpp.shopOrderID = cso.shopOrderID AND crp.status = '1' AND crp.delFlag = 0 LIMIT 1) > 0, 1, 0) AS
@@ -1408,8 +1409,9 @@
         cso.splitFlag,
         cso.shopOtherFee,
         s.name AS shopName,
-        (SELECT SUM(cmCostPrice*(num+presentnum) )FROM cm_order_product WHERE shopOrderId = cso.shopOrderId) AS
-        cmCostPrice,
+        (select ifnull(sum(cop.cmCostPrice * cop.num), 0) +
+        IF(cso.rebateOrder = 1 ,IFNULL(cso.shopPostFee,0)- IFNULL(cso.supplierFreight,0),0)
+        from cm_order_product cop where cop.shopOrderID = cso.shopOrderId) AS cmCostPrice,
         IF((SELECT (crpp.id) FROM cm_returned_purchase_product crpp LEFT JOIN cm_returned_purchase crp ON crp.id =
         crpp.returnedID
         WHERE crpp.shopOrderID = cso.shopOrderID AND crp.status = '1' AND crp.delFlag = 0 LIMIT 1) > 0, 1, 0) AS