有欠款

biz-ghs/order/services/OrderService.php

@@ -783,7 +783,7 @@ class OrderService extends BaseService
             StatYjClass::addYj($main, $shop, $shopAdminId, $yjAmount);
         }
 
-        //客户资产变化
+        //欠款
         if ($payWay == dict::getDict('payWay', 'debtPay')) {
             CustomClass::cgDebtAmountAdd($custom, $order);
         }

biz-hd/order/classes/OrderClass.php

@@ -243,6 +243,7 @@ class OrderClass extends BaseClass
             util::fail('订单不是待付款状态');
         }
         $orderId = $order->id ?? 0;
+        $customId = $order->customId ?? 0;
         if ($order->fromType == 3) {
             //客服下的单要配送流程
             $order->status = self::ORDER_STATUS_UN_SEND;
@@ -311,12 +312,18 @@ class OrderClass extends BaseClass
             ShopClass::customKdAddBalance($main, $shop, $amount, $order, $capitalType);
         }
 
-        //现金付款余额增加
+        //有尾款或全欠款
+        if ((isset($order->remainDebtPrice) && $order->remainDebtPrice > 0)) {
+            $newCustom = CustomClass::getLockById($customId);
+            CustomClass::cgDebtAmountAdd($newCustom, $order);
+        }
+
+        //全部现金付款余额增加
         if ($payWay == dict::getDict('payWay', 'cash')) {
             $moneyBalance = bcadd($main->money, $order->mainPay, 2);
             $main->money = $moneyBalance;
             $main->save();
-            $moneyEvent = "客户现金下单".floatval($order->mainPay)."元（单号 {$order->orderSn}）";
+            $moneyEvent = "客户现金下单" . floatval($order->mainPay) . "元（单号 {$order->orderSn}）";
             $moneyRemark = '';
             $change = [
                 'relateId' => $orderId,
@@ -331,6 +338,7 @@ class OrderClass extends BaseClass
             ];
             ShopMoneyChangeClass::addData($change);
         } else {
+            //部分现金付款
             $orderCash = $order->cash ?? 0;
             $orderCash = floatval($orderCash);
             if ($orderCash > 0) {

biz-hd/order/services/OrderService.php

@@ -282,6 +282,12 @@ class OrderService extends BaseService
             $data['remainDebtPrice'] = $currentDebt;
             $data['debt'] = 1;
         }
+        if ($hasPay == dict::getDict('hasPay', 'debt')) {
+            $data['debtPrice'] = $modifyPrice;
+            $data['remainDebtPrice'] = $modifyPrice;
+            $data['debt'] = 1;
+        }
+
         $data['actPrice'] = $modifyPrice;
         $data['realPrice'] = $modifyPrice;
         $data['customId'] = $customId;
@@ -299,12 +305,6 @@ class OrderService extends BaseService
         //保存订单
         $returnOrder = OrderClass::addOrder($data);
 
-        if (isset($data['dj']) && $data['dj'] > 0) {
-            //有订金客户的欠款增加
-            $newCustom = CustomClass::getLockById($customId);
-            CustomClass::cgDebtAmountAdd($newCustom, $returnOrder);
-        }
-
         //欠款和已付款的直接完成，另外客服下的单要走配送流程，所以是待配送状态
         if (in_array($hasPay, [dict::getDict('hasPay', 'payed'), dict::getDict('hasPay', 'debt')])) {
             OrderClass::payAfter($returnOrder, $payWay);