shish hace 11 meses
padre
commit
95dabe4648

+ 3 - 4
biz-hd/custom/classes/CustomClass.php

@@ -459,7 +459,7 @@ class CustomClass extends BaseClass
     }
     }
 
 
     //欠款和余额支付的售后 ssh 20250803
     //欠款和余额支付的售后 ssh 20250803
-    public static function skRefundDebtAmountReduce($custom, $amount, $refund)
+    public static function skRefundDebtAmountReduce($custom, $amount, $refund, $payWay)
     {
     {
         $hdId = $custom->hdId ?? 0;
         $hdId = $custom->hdId ?? 0;
         $hd = HdClass::getLockById($hdId);
         $hd = HdClass::getLockById($hdId);
@@ -490,15 +490,14 @@ class CustomClass extends BaseClass
         if (empty($order)) {
         if (empty($order)) {
             util::fail('没有找到订单哈!');
             util::fail('没有找到订单哈!');
         }
         }
-        $currentPayWay = $order->payWay ?? 0;
 
 
         // 多处需要同步修改 balance_pay_give
         // 多处需要同步修改 balance_pay_give
         $mustUseGiveAmount = 0;
         $mustUseGiveAmount = 0;
         $buyAmount = 0;
         $buyAmount = 0;
-        if ($currentPayWay == 3) {
+        if ($payWay == 3) {
             //如果是欠款单售后,没有退款到赠送余额的情况
             //如果是欠款单售后,没有退款到赠送余额的情况
             $buyAmount = $amount;
             $buyAmount = $amount;
-        } elseif ($currentPayWay == 2) {
+        } elseif ($payWay == 2) {
             //这个是总消费余额中充值余额部分
             //这个是总消费余额中充值余额部分
             $payBalance = $order->payBalance ?? 0;
             $payBalance = $order->payBalance ?? 0;
             //这个是累计已经退还的余额
             //这个是累计已经退还的余额

+ 2 - 2
biz-hd/refund/services/HdRefundService.php

@@ -296,7 +296,7 @@ class HdRefundService extends BaseService
                     $order->debt = 0;
                     $order->debt = 0;
                 }
                 }
                 $order->save();
                 $order->save();
-                CustomClass::skRefundDebtAmountReduce($custom, $refundPrice, $refund);
+                CustomClass::skRefundDebtAmountReduce($custom, $refundPrice, $refund,$payWay);
             }
             }
             if ($payWay == dict::getDict('payWay', 'cash')) {
             if ($payWay == dict::getDict('payWay', 'cash')) {
                 //如果现金支付
                 //如果现金支付
@@ -310,7 +310,7 @@ class HdRefundService extends BaseService
             }
             }
             if ($payWay == dict::getDict('payWay', 'balancePay')) {
             if ($payWay == dict::getDict('payWay', 'balancePay')) {
                 //如果是余额支付,客户的余额要增加
                 //如果是余额支付,客户的余额要增加
-                CustomClass::skRefundDebtAmountReduce($custom, $refundPrice, $refund);
+                CustomClass::skRefundDebtAmountReduce($custom, $refundPrice, $refund,$payWay);
             }
             }
         }
         }
         return $refund;
         return $refund;