shish 5 vuotta sitten
vanhempi
commit
3bf513f822

+ 1 - 2
biz-hd/merchant/classes/ShopClass.php

@@ -106,7 +106,7 @@ class ShopClass extends BaseClass
 
     //门店增加余额 ssh 2021.2.21
     //$fix = false 余额使用时不需要指定在谁那边用
-    public static function addBalance($shop, $amount, $order, $tx, $fix = false)
+    public static function addBalance($shop, $amount, $order, $tx, $capitalType, $fix = false)
     {
         //门店余额增加
         $currentBalance = bcadd($shop->balance, $amount, 2);
@@ -126,7 +126,6 @@ class ShopClass extends BaseClass
         $shop->save();
 
         //增加余额变动记录
-        $capitalType = $order->capitalType;
         $id = $order->id;
         $change = [
             'relateId' => $id,

+ 2 - 1
biz/recharge/classes/RechargeClass.php

@@ -48,7 +48,8 @@ class RechargeClass extends BaseClass
         $amount = $recharge->amount;
         //门店和平台余额增加
         $tx = dict::getDict('yeTx', 'canNot');
-        ShopClass::addBalance($shop, $amount, $recharge, $tx);
+        $capitalType = dict::getDict('capitalType', 'xhRecharge');
+        ShopClass::addBalance($shop, $amount, $recharge, $tx, $capitalType);
 
         if ($rechargeRenew == 1) {
             $sjId = $recharge->sjId;