客户下单增加余额

biz-hd/order/classes/OrderClass.php

@@ -223,9 +223,6 @@ class OrderClass extends BaseClass
         $shop->save();
 
         $capitalType = dict::getDict('capitalType', 'xhOrder', 'id');
-        //门店余额增加
-        ShopClass::customKdAddBalance($shop, $actPrice, $order, $capitalType);
-
         $shopAdminId = $order->shopAdminId ?? 0;
         $shopAdminName = $order->shopAdminName ?? '';
         $sjId = $order->merchantId;
@@ -276,11 +273,12 @@ class OrderClass extends BaseClass
             }
         } else {
 
-            //客户微信支付
-            if ($payWay == dict::getDict('payWay', 'wxPay')) {
-                $capitalType = dict::getDict('capitalType', 'xhOrder');
+            //客户下单增加商家可提现余额
+            if (isset($order->customId) && !empty($order->customId)) {
+
                 $amount = $order->actPrice;
                 ShopClass::customKdAddBalance($shop, $amount, $order, $capitalType);
+
             }
             //门店和朋友圈订单并且没有填写收花人的直接将订单置为自取并且是完成状态
             if (in_array($order->fromType, [dict::getDict("fromType", "shop"), dict::getDict("fromType", "friend")])) {

biz-hd/px/classes/PxApplyClass.php

@@ -84,8 +84,11 @@ class PxApplyClass extends BaseClass
         $shop->save();
 
         $capitalType = dict::getDict('capitalType', 'pxApply', 'id');
-        //门店余额增加
-        ShopClass::customKdAddBalance($shop, $actPrice, $order, $capitalType);
+
+        //客户付款报名的，增加门店余额
+        if(isset($order->customId) && !empty($order->customId)){
+            ShopClass::customKdAddBalance($shop, $actPrice, $order, $capitalType);
+        }
 
         $sjId = $order->sjId ?? 0;
         $shopId = $order->shopId ?? 0;

biz/shop/classes/ShopClass.php

@@ -151,7 +151,7 @@ class ShopClass extends BaseClass
         //门店余额增加
         $currentBalance = bcadd($shop->balance, $amount, 2);
         $shop->balance = $currentBalance;
-        $shop->totalRecharge += $amount;
+        $shop->totalRecharge = bcadd($shop->totalRecharge, $amount, 2);
         //可提现余额同步增加
         $currentTx = bcadd($shop->txBalance, $amount, 2);
         $shop->txBalance = $currentTx;