main

biz-hd/purchase/services/PurchaseService.php

@@ -347,7 +347,7 @@ class PurchaseService extends BaseService
         $actPrice = $info->actPrice;
         //余额支付引起余额减少
         if ($payWay == dict::getDict('payWay', 'balancePay')) {
-            ShopClass::purchaseReduceBalance($shop, $realPrice, $info);//////////////////////////////////////////////////////////
+            ShopClass::purchaseReduceBalance($main, $shop, $realPrice, $info);
         }
         $main->totalPurchase = bcadd($main->totalPurchase, $actPrice, 2);
         $currentExpend = bcadd($main->totalExpend, $actPrice, 2);
@@ -389,7 +389,7 @@ class PurchaseService extends BaseService
         $main->save();
 
         //支出统计
-        StatOutClass::updateOrInsert($shop, $info->orderPrice);///////////////////////////////////////////////////
+        StatOutClass::updateOrInsert($main, $shop, $info->orderPrice);
         //支出流水
         $capitalType = dict::getDict('capitalType', 'xhPurchase', 'id');
         $sjId = $info->sjId ?? 0;
@@ -409,7 +409,7 @@ class PurchaseService extends BaseService
 
         //采购总量统计
         $cgNum = $info->bigNum ?? 0;
-        StatCgClass::replace($shop, $info->orderPrice, $cgNum);//////////////////////////////////////////////////////
+        StatCgClass::replace($main, $shop, $info->orderPrice, $cgNum);
         //按供货商分别统计采购量
         $num = $info->bigNum ?? 0;
         $amount = $info->orderPrice ?? 0;
@@ -432,7 +432,7 @@ class PurchaseService extends BaseService
         if (isset($info->ghsShopAdminId) && !empty($info->ghsShopAdminId)) {
             $noNeedWxNotice = isset(Yii::$app->params['noNeedWxNotice']) ? Yii::$app->params['noNeedWxNotice'] : 0;
             if ($noNeedWxNotice == 0) {
-                WxMessageClass::generateCgOrder($shop, $info);///////////////////////////////////////////////////////////////
+                WxMessageClass::generateCgOrder($shop, $info);
             }
         }
 

biz/shop/classes/ShopClass.php

@@ -350,28 +350,28 @@ class ShopClass extends BaseClass
     }
 
     //采购余额付款，减少余额 ssh 20210519
-    public static function purchaseReduceBalance($shop, $amount, $order)
+    public static function purchaseReduceBalance($main, $shop, $amount, $order)
     {
-        if (bccomp($amount, $shop->balance, 2) == 1) {
+        if (bccomp($amount, $main->balance, 2) == 1) {
             util::fail('余额不足');
         }
         $sjId = $order->sjId;
         $shopId = $order->shopId;
         $mainId = $order->mainId ?? 0;
 
-        $currentBalance = bcsub($shop->balance, $amount, 2);
-        $shop->balance = $currentBalance;
+        $currentBalance = bcsub($main->balance, $amount, 2);
+        $main->balance = $currentBalance;
 
         $tx = dict::getDict('yeTx', 'canNot');
 
         //还有可提现余额也要先用掉
-        $currentTxBalance = $shop->txBalance;
+        $currentTxBalance = $main->txBalance;
         if ($currentTxBalance > 0) {
             $reduceTxBalance = $currentTxBalance > $amount ? $amount : $currentTxBalance;
-            $shop->txBalance = bcsub($currentTxBalance, $reduceTxBalance, 2);
+            $main->txBalance = bcsub($currentTxBalance, $reduceTxBalance, 2);
             $tx = dict::getDict('yeTx', 'can');
         }
-        $shop->save();
+        $main->save();
 
         $capitalType = dict::getDict('capitalType', 'xhPurchase', 'id');
 

biz/stat/classes/StatCgClass.php

@@ -19,7 +19,7 @@ class StatCgClass extends BaseClass
     }
 
     //采购统计 ssh 20210828
-    public static function replace($shop, $amount, $num = 0, $add = true)
+    public static function replace($main, $shop, $amount, $num = 0, $add = true)
     {
         $mainId = $shop->mainId ?? 0;
         $sjId = $shop->sjId ?? 0;
@@ -40,11 +40,11 @@ class StatCgClass extends BaseClass
             $currentAmount = bcsub($unique->refundAmount, $amount, 2);
             $unique->refundAmount = $currentAmount;
         }
-        $unique->totalAmount = $shop->totalPurchase;
+        $unique->totalAmount = $main->totalPurchase;
         $unique->num += $num;
         $unique->save();
         //当月
-        StatCgMonthClass::replace($shop, $amount, $num, $add);
+        StatCgMonthClass::replace($main, $shop, $amount, $num, $add);
     }
 
     //今日采购

biz/stat/classes/StatCgMonthClass.php

@@ -11,7 +11,7 @@ class StatCgMonthClass extends BaseClass
     public static $baseFile = '\biz\stat\models\StatCgMonth';
 
     //采购统计 ssh 20210528
-    public static function replace($shop, $amount, $num, $add = true)
+    public static function replace($main, $shop, $amount, $num, $add = true)
     {
         $time = date('Ym');
         $year = date('Y');
@@ -33,7 +33,7 @@ class StatCgMonthClass extends BaseClass
             $currentAmount = bcsub($unique->amount, $amount, 2);
         }
         $unique->amount = $currentAmount;
-        $unique->totalAmount = $shop->totalPurchase;
+        $unique->totalAmount = $main->totalPurchase;
         $unique->num += $num;
         $unique->save();
     }

biz/stat/classes/StatOutClass.php

@@ -22,7 +22,7 @@ class StatOutClass extends BaseClass
 
     //更新当前商家的数据 lqh 2021.4.13
     // 当采购后台，将价格更新
-    public static function updateOrInsert($shop, $amount)
+    public static function updateOrInsert($main, $shop, $amount)
     {
         $mainId = $shop->mainId ?? 0;
         $sjId = $shop->sjId ?? 0;
@@ -38,10 +38,10 @@ class StatOutClass extends BaseClass
         }
         $currentAmount = bcadd($unique->amount, $amount, 2);
         $unique->amount = $currentAmount;
-        $unique->totalAmount = $shop->totalExpend;
+        $unique->totalAmount = $main->totalExpend;
         $unique->save();
         //当月
-        StatOutMonthClass::updateOrInsert($shop, $amount);
+        StatOutMonthClass::updateOrInsert($main, $shop, $amount);
     }
 
 }

biz/stat/classes/StatOutMonthClass.php

@@ -10,7 +10,7 @@ class StatOutMonthClass extends BaseClass
 
     public static $baseFile = '\biz\stat\models\StatOutMonth';
 
-    public static function updateOrInsert($shop, $amount)
+    public static function updateOrInsert($main, $shop, $amount)
     {
         $time = date('Ym');
         $year = date('Y');
@@ -27,7 +27,7 @@ class StatOutMonthClass extends BaseClass
         }
         $currentAmount = bcadd($unique->amount, $amount, 2);
         $unique->amount = $currentAmount;
-        $unique->totalAmount = $shop->totalExpend;
+        $unique->totalAmount = $main->totalExpend;
         $unique->save();
     }