shish 1 month ago
parent
commit
d082bf0f77
2 changed files with 3 additions and 17 deletions
  1. 1 1
      app-ghs/controllers/GhsController.php
  2. 2 16
      biz-ghs/ghs/classes/GhsClass.php

+ 1 - 1
app-ghs/controllers/GhsController.php

@@ -259,7 +259,7 @@ class GhsController extends BaseController
                 }
             }
         } else {
-            // 总待结:各供货商 xhGhs 净 balance 为负的部分之和(合并后模型)
+            // 总欠款:各供货商 balance 字段之和
             $totalDebtAmount = GhsClass::sumTotalOutstandingDebt($this->mainId, 0);
         }
         $list['totalDebtAmount'] = $totalDebtAmount;

+ 2 - 16
biz-ghs/ghs/classes/GhsClass.php

@@ -50,22 +50,8 @@ class GhsClass extends BaseClass
         if (empty($mainId)) {
             return '0.00';
         }
-        $rows = self::getAllByCondition(
-            ['ownMainId' => $mainId, 'delStatus' => $delStatus],
-            null,
-            'balance,debtAmount,balanceMerged',
-            null,
-            true
-        );
-        if (empty($rows)) {
-            return '0.00';
-        }
-        $total = '0.00';
-        foreach ($rows as $row) {
-            $attrs = is_array($row) ? $row : $row->getAttributes();
-            $total = bcadd($total, AccountMoneyClass::getOutstandingDebt($attrs), 2);
-        }
-        return $total;
+        $sum = self::sum(['ownMainId' => $mainId, 'delStatus' => $delStatus], 'balance');
+        return bcadd($sum ?: '0', '0', 2);
     }