Merge branch 'clear-cg' into dev

app-ghs/controllers/ClearController.php

@@ -87,7 +87,7 @@ class ClearController extends BaseController
             util::fail('账单已取消');
         }
         $clear->status = ClearClass::STATUS_EXPIRE;
-        $clear->remark = "商家手动取消 " . date("Y-m-d H:i:s") . ' 操作人：' . $staffName;
+        $clear->remark = "商家主动取消 " . date("m-d H:i") . ' 操作人 ' . $staffName;
         $clear->save();
 
         $ghsShop = $this->shop;
@@ -190,4 +190,4 @@ class ClearController extends BaseController
         util::success($respond);
     }
 
-}
+}

app-ghs/controllers/GhsController.php

@@ -260,7 +260,7 @@ class GhsController extends BaseController
             }
         } else {
             // 总欠款：各供货商 balance 字段之和
-            $totalDebtAmount = GhsClass::sumTotalOutstandingDebt($this->mainId, 0);
+            $totalDebtAmount = GhsClass::sumTotalOutstandingDebt($this->shopId, 0);
         }
         $list['totalDebtAmount'] = $totalDebtAmount;
         util::success($list);
@@ -278,4 +278,4 @@ class GhsController extends BaseController
         util::success(['file' => $fileUrl, 'shortFile' => $shortFile]);
     }
 
-}
+}

biz-ghs/ghs/classes/GhsClass.php

@@ -45,12 +45,12 @@ class GhsClass extends BaseClass
         ];
     }
 
-    public static function sumTotalOutstandingDebt($mainId, $delStatus = 0)
+    public static function sumTotalOutstandingDebt($shopId, $delStatus = 0)
     {
-        if (empty($mainId)) {
+        if (empty($shopId)) {
             return '0.00';
         }
-        $sum = self::sum(['ownMainId' => $mainId, 'delStatus' => $delStatus], 'balance');
+        $sum = self::sum(['ownShopId' => $shopId, 'delStatus' => $delStatus], 'balance');
         return bcadd($sum ?: '0', '0', 2);
     }