Merge branch 'clear-cg' into dev

app-ghs/controllers/GhsController.php

@@ -12,8 +12,6 @@ use common\components\orderSn;
 use common\components\stringUtil;
 use Yii;
 use common\components\util;
-use bizGhs\order\classes\PurchaseOrderClass;
-
 class GhsController extends BaseController
 {
 
@@ -253,8 +251,8 @@ class GhsController extends BaseController
                 }
             }
         } else {
-            //累计总欠款
-            $totalDebtAmount = PurchaseOrderClass::sum(['mainId' => $this->mainId, 'status' => 4, 'debt' => PurchaseOrderClass::DEBT_YES], 'actPrice');
+            // 总待结：各供货商 xhGhs 净 balance 为负的部分之和（合并后模型）
+            $totalDebtAmount = GhsClass::sumTotalOutstandingDebt($this->mainId, 0);
         }
         $list['totalDebtAmount'] = $totalDebtAmount;
         util::success($list);

biz-ghs/ghs/classes/GhsClass.php

@@ -22,6 +22,32 @@ class GhsClass extends BaseClass
         return $data;
     }
 
+    /**
+     * 批发店采购：按 xhGhs 净 balance 汇总总待结（balance<0 部分之和，合并后模型）
+     */
+    public static function sumTotalOutstandingDebt($mainId, $delStatus = 0)
+    {
+        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;
+    }
+
 
     public static function groupBaseInfo($list)
     {