shish 2 лет назад
Родитель
Сommit
0b75118583
1 измененных файлов с 8 добавлено и 4 удалено
  1. 8 4
      biz-ghs/order/classes/OrderClass.php

+ 8 - 4
biz-ghs/order/classes/OrderClass.php

@@ -1904,10 +1904,6 @@ class OrderClass extends BaseClass
         $customId = $order->customId ?? 0;
         $custom = CustomClass::getById($customId, true);
         $debtAmount = $custom->debtAmount ?? 0;
-        $balance = $custom->balance ?? 0;
-        if ($debtAmount >= $balance) {
-            $debtAmount = bcsub($debtAmount, $balance, 2);
-        }
         $mainId = $order->mainId ?? 0;
 
         $dir = Yii::getAlias('@app/web/html/' . $mainId . '/');
@@ -1982,6 +1978,14 @@ class OrderClass extends BaseClass
             return ['imgFile' => ''];
         }
 
+        $balance = $custom->balance ?? 0;
+        if ($debtAmount >= $balance) {
+            $debtAmount = bcsub($debtAmount, $balance, 2);
+        }
+        if ($beforeDebtPrice >= $balance) {
+            $beforeDebtPrice = bcsub($beforeDebtPrice, $balance, 2);
+        }
+
         $totalNum = 0;
         $totalAmount = 0;
         foreach ($itemList as $item) {