欠款问题

biz-ghs/custom/classes/CustomClass.php

@@ -142,7 +142,7 @@ class CustomClass extends BaseClass
     }
 
     //客户采购欠款金额增加 ssh 20220306
-    public static function cgDebtAmountAdd($custom, $order)
+    public static function cgDebtAmountAdd($custom, $order, $bookOrder = false)
     {
         $amount = $order->realPrice ?? 0;
         $custom->isDebt = CustomClass::IS_DEBT_YES;
@@ -158,6 +158,10 @@ class CustomClass extends BaseClass
         $customId = $custom->id ?? 0;
         $orderSn = $order->orderSn ?? '';
         $capitalType = dict::getDict('capitalType', 'xhGhsOrder', 'id');
+        $event = '购买花材，单号：' . $orderSn;
+        if ($bookOrder) {
+            $event = '预订单多退少补，单号：' . $orderSn;
+        }
 
         $change = [
             'relateId' => $relateId,
@@ -168,7 +172,7 @@ class CustomClass extends BaseClass
             'balance' => $balance,
             'io' => 1,
             'payWay' => $order->payWay,
-            'event' => '购买花材，单号：' . $orderSn,
+            'event' => $event,
             'sjId' => $order->sjId,
             'shopId' => $order->id,
         ];

biz-ghs/order/classes/OrderClass.php

@@ -307,6 +307,8 @@ class OrderClass extends BaseClass
 
                 $payWay = dict::getDict('payWay', 'debtPay');
 
+                CustomClass::cgDebtAmountAdd($custom, $order, true);
+
                 //收入增加
                 StatIncomeClass::updateOrInsert($main, $shop, $currentDebt);
                 //收入流水增加

biz-hd/ghs/classes/GhsClass.php

@@ -14,10 +14,10 @@ class GhsClass extends BaseClass
     public static $baseFile = '\bizHd\ghs\models\Ghs';
 
     //供应商销售欠款金额增加 ssh 20220306
-    public static function xsDebtAmountAdd($ghs, $order)
+    public static function cgDebtAmountAdd($ghs, $order, $bookOrder = false)
     {
         $amount = $order->realPrice ?? 0;
-        $balance = bcadd($ghs->debtAmount, $order->actPrice, 2);
+        $balance = bcadd($ghs->debtAmount, $order->remainDebtPrice, 2);
         $ghs->debt = 2;
         $ghs->debtAmount = $balance;
         $ghs->save();
@@ -26,6 +26,10 @@ class GhsClass extends BaseClass
         $orderSn = $order->orderSn ?? '';
         $ghsId = $ghs->id ?? 0;
         $capitalType = dict::getDict('capitalType', 'xhPurchase', 'id');
+        $event = '购买花材，采购单号：' . $orderSn;
+        if ($bookOrder) {
+            $event = '预订单多退少补，单号' . $orderSn;
+        }
 
         $change = [
             'relateId' => $relateId,
@@ -36,7 +40,7 @@ class GhsClass extends BaseClass
             'balance' => $balance,
             'io' => 1,
             'payWay' => $order->payWay,
-            'event' => '购买花材，采购单号：'.$orderSn,
+            'event' => $event,
             'sjId' => $order->sjId ?? 0,
             'shopId' => $order->shopId ?? 0,
         ];

biz-hd/purchase/classes/PurchaseClass.php

@@ -262,12 +262,19 @@ class PurchaseClass extends BaseClass
 
             $payWay = dict::getDict('payWay', 'debtPay');
 
+            $ghsId = $cg->ghsId ?? 0;
+            $ghs = GhsClass::getLockById($ghsId);
+            if (empty($ghs)) {
+                util::fail('没有找到供应商');
+            }
+            \bizHd\ghs\classes\GhsClass::cgDebtAmountAdd($ghs, $cg, true);
+
             //支出统计
             StatOutClass::updateOrInsert($main, $shop, $currentDebt);
             //支出流水
             $capitalType = dict::getDict('capitalType', 'hdBookFinalPay', 'id');
-            $sjId = $info->sjId ?? 0;
-            $shopId = $info->shopId ?? 0;
+            $sjId = $cg->sjId ?? 0;
+            $shopId = $cg->shopId ?? 0;
 
             $currentExpend = bcadd($main->totalExpend, $currentDebt, 2);
             $main->totalExpend = $currentExpend;

biz-hd/purchase/services/PurchaseService.php

@@ -425,7 +425,7 @@ class PurchaseService extends BaseService
             util::fail('没有找到供应商');
         }
         if ($payWay == dict::getDict('payWay', 'debtPay')) {
-            \bizHd\ghs\classes\GhsClass::xsDebtAmountAdd($ghs, $info);
+            \bizHd\ghs\classes\GhsClass::cgDebtAmountAdd($ghs, $info);
         }
         $ghs->expendAmount = bcadd($ghs->expendAmount, $actPrice, 2);
         $ghs->expendNum += 1;