shish пре 2 година
родитељ
комит
3f938403bc
1 измењених фајлова са 6 додато и 2 уклоњено
  1. 6 2
      biz-ghs/stat/classes/StatSaleClass.php

+ 6 - 2
biz-ghs/stat/classes/StatSaleClass.php

@@ -258,10 +258,14 @@ class StatSaleClass extends BaseClass
             foreach ($ghsOrderList as $ghsKey => $ghsOrder) {
                 $actPrice = $ghsOrder['actPrice'] ?? 0;
                 $sendCost = $ghsOrder['sendCost'] ?? 0;
+                $refundSendCost = $ghsOrder['refundSendCost'] ?? 0;
+                $remainSendCost = bcsub($sendCost, $refundSendCost, 2);
                 $packCost = $ghsOrder['packCost'] ?? 0;
+                $refundPackCost = $ghsOrder['refundPackCost'] ?? 0;
+                $remainPackCost = bcsub($packCost, $refundPackCost, 2);
                 $pfIncome = bcadd($pfIncome, $actPrice, 2);
-                $pfSendCost = bcadd($pfSendCost, $sendCost, 2);
-                $pfPack = bcadd($pfPack, $packCost, 2);
+                $pfSendCost = bcadd($pfSendCost, $remainSendCost, 2);
+                $pfPack = bcadd($pfPack, $remainPackCost, 2);
                 $totalOrderNum++;
             }
         }