main

app-ghs/controllers/ProductController.php

@@ -69,12 +69,10 @@ class ProductController extends BaseController
     public function actionList()
     {
         $where = [];
-        $where['sjId'] = $this->sjId;
         $classId = Yii::$app->request->get('classId', 0);
         if (!empty($classId)) {
             $where['classId'] = $classId;
         }
-
         $name = Yii::$app->request->get('name', '');
         if (empty($name)) {
             $py = Yii::$app->request->get('py', '');
@@ -87,17 +85,14 @@ class ProductController extends BaseController
                 $where['name'] = ['like', $name];
             }
         }
-
         $status = Yii::$app->request->get('status', 0);
         if (!empty($status)) {
             $where['status'] = $status;
         }
-
         $delStatus = Yii::$app->request->get('delStatus', 0);
         if ($delStatus != 2) {
             $where['delStatus'] = $delStatus;
         }
-
         $where['mainId'] = $this->mainId;
         $productIds = Yii::$app->request->get('ids', '');
         if (!empty($productIds)) {

biz-hd/purchase/classes/PurchaseClearClass.php

@@ -152,7 +152,7 @@ class PurchaseClearClass extends BaseClass
         }
         if ($payWay == dict::getDict('payWay', 'wxPay')) {
             //供应商门店余额增加
-            ShopClass::customClearAddBalance($shop, $order);
+            ShopClass::customClearAddBalance($main, $shop, $order);
         }
         //供应商的门店应收客户款减少
         $currentGathering = bcsub($main->mayGathering, $order->actPrice, 2);

biz-hd/purchase/services/PurchaseService.php

@@ -383,8 +383,8 @@ class PurchaseService extends BaseService
         }
         if ($payWay == dict::getDict('payWay', 'debtPay')) {
             //应付供应商款增加
-            $currentMayPay = bcadd($shop->mayPay, $realPrice, 2);
-            $shop->mayPay = $currentMayPay;
+            $currentMayPay = bcadd($main->mayPay, $realPrice, 2);
+            $main->mayPay = $currentMayPay;
         }
         $main->save();
 

biz-hd/stat/classes/StatIncomeClass.php

@@ -22,7 +22,7 @@ class StatIncomeClass extends BaseClass
         $where = ['mainId' => $mainId, 'time' => $time];
         $model = self::getByCondition($where, true);
         if (empty($model)) {
-            $data = ['mainId' => $mainId, 'time' => $time, 'amount' => 0, 'totalAmount' => $shop->totalIncome, 'createTime' => date('Y-m-d H:i:s')];
+            $data = ['mainId' => $mainId, 'time' => $time, 'amount' => 0, 'totalAmount' => $main->totalIncome, 'createTime' => date('Y-m-d H:i:s')];
             $model = self::add($data, true);
         }
         $id = $model->id;