欠款

biz-hd/custom/classes/CustomClass.php

@@ -81,7 +81,7 @@ class CustomClass extends BaseClass
         $relateId = $refund->id ?? 0;
         $customId = $custom->id ?? 0;
         $capitalType = dict::getDict('capitalType', 'hdRefund', 'id');
-        $orderSn = $refund->orderSn ?? '';
+        $refundSn = $refund->refundSn ?? '';
 
         $change = [
             'relateId' => $relateId,
@@ -92,7 +92,7 @@ class CustomClass extends BaseClass
             'balance' => $remain,
             'io' => 0,
             'payWay' => 0,
-            'event' => "客户申请退款，退款单号：{$orderSn}",
+            'event' => "客户申请退款，退款单号：{$refundSn}",
             'sjId' => $refund->sjId ?? 0,
             'shopId' => $refund->shopId ?? 0,
             'mainId' => $refund->mainId ?? 0,
@@ -109,7 +109,7 @@ class CustomClass extends BaseClass
         $main->debt = $totalRemain;
         $main->save();
 
-        $event = $custom->name . "申请退款，退款单号：{$orderSn}";
+        $event = $custom->name . "申请退款，退款单号：{$refundSn}";
         $change['balance'] = $totalRemain;
         $change['event'] = $event;
         TotalDebtChangeClass::addChange($change);

biz-hd/refund/services/HdRefundService.php

@@ -308,15 +308,15 @@ class HdRefundService extends BaseService
                 //部分欠款的订单，付了订金的订单
                 if ($order->remainDebtPrice > 0) {
                     if ($refundPrice > $order->remainDebtPrice) {
+                        CustomClass::refundDebtAmountReduce($custom, $order->remainDebtPrice, $refund);
                         $order->remainDebtPrice = 0;
                         $order->debt = 0;
                         $order->save();
-                        CustomClass::refundDebtAmountReduce($custom, $order->remainDebtPrice, $refund);
                     } else {
+                        CustomClass::refundDebtAmountReduce($custom, $refundPrice, $refund);
                         $currentRemain = bcsub($order->remainDebtPrice, $refundPrice, 2);
                         $order->remainDebtPrice = $currentRemain;
                         $order->save();
-                        CustomClass::refundDebtAmountReduce($custom, $refundPrice, $refund);
                     }
                 }
             }