main信息完善

biz-ghs/order/classes/OrderClass.php

@@ -360,6 +360,11 @@ class OrderClass extends BaseClass
         if (empty($shop)) {
             util::fail('没有找到门店');
         }
+        $mainId = $shop->mainId ?? 0;
+        $main = MainClass::getLockById($mainId);
+        if (empty($main)) {
+            util::fail('没有main信息');
+        }
 
         //花材
         $product = $data['product'];
@@ -442,12 +447,12 @@ class OrderClass extends BaseClass
         $data['deadline'] = $data['deadline'] ?? date("Y-m-d H:i:s", $current);
         $data['status'] = self::ORDER_STATUS_UN_PAY;
 
-        $shop->totalOrder += 1;
-        $shop->unPayOrder += 1;
-        $shop->save();
+        $main->totalOrder += 1;
+        $main->unPayOrder += 1;
+        $main->save();
 
         //将当天日期+花店每天的总订单数作为编号
-        $data['sendNum'] = date("j") . StatOrderCountClass::addOrder($shop);
+        $data['sendNum'] = date("j") . StatOrderCountClass::addOrder($shop, $main);
 
         //订单有效期
         $currentTime = time();

biz-hd/order/classes/OrderClass.php

@@ -92,9 +92,17 @@ class OrderClass extends BaseClass
 
         //累计订单增加
         $shop = ShopClass::getLockById($shopId);
-        $shop->unPayOrder += 1;
-        $shop->totalOrder += 1;
-        $shop->save();
+        if (empty($shop)) {
+            util::fail('没有找到门店信息');
+        }
+        $mainId = $shop->mainId ?? 0;
+        $main = MainClass::getById($mainId, true);
+        if (empty($main)) {
+            util::fail('没有找到main信息');
+        }
+        $main->unPayOrder += 1;
+        $main->totalOrder += 1;
+        $main->save();
 
         //将花店每月的总订单数作为编号
         $riseNum = StatOrderCountClass::addOrder($shop);

biz-mall/base/classes/BaseClass.php

@@ -4,7 +4,7 @@ namespace bizMall\base\classes;
 
 use Yii;
 
-class BaseClass
+class BaseClass extends \common\base\classes\BaseClass
 {
 	
 	public static $baseFile;

biz-mall/order/classes/OrderClass.php

@@ -5,6 +5,7 @@ namespace bizMall\order\classes;
 use biz\shop\models\Shop;
 use biz\stat\classes\StatOrderCountClass;
 use bizMall\merchant\classes\MerchantAssetClass;
+use bizMall\shop\classes\MainClass;
 use bizMall\stat\classes\StatOrderClass;
 use bizMall\user\classes\UserClass;
 use common\components\miniUtil;
@@ -67,7 +68,12 @@ class OrderClass extends BaseClass
         if (empty($shop)) {
             util::fail('没有找到门店');
         }
-        $riseNum = StatOrderCountClass::addOrder($shop);
+        $mainId = $shop->mainId ?? 0;
+        $main = MainClass::getLockById($mainId);
+        if (empty($main)) {
+            util::fail('没有main信息');
+        }
+        $riseNum = StatOrderCountClass::addOrder($shop, $main);
 
         //将花店每月的总订单数作为编号
         $data['sendNum'] = date('j') . $riseNum;
@@ -78,9 +84,9 @@ class OrderClass extends BaseClass
         if (empty($shop)) {
             util::fail('没有找到门店');
         }
-        $shop->unPayOrder += 1;
-        $shop->totalOrder += 1;
-        $shop->save();
+        $main->unPayOrder += 1;
+        $main->totalOrder += 1;
+        $main->save();
 
         return $return;
     }

biz/stat/classes/StatOrderCountClass.php

@@ -11,7 +11,7 @@ class StatOrderCountClass extends BaseClass
     public static $baseFile = '\biz\stat\models\StatOrderCount';
 
     //每天订单
-    public static function addOrder($shop)
+    public static function addOrder($shop, $main)
     {
         $time = date('Ymd');
         $shopId = $shop->id;
@@ -22,7 +22,7 @@ class StatOrderCountClass extends BaseClass
         ];
         $model = self::getByCondition($where, true);
         if (empty($model)) {
-            $model = self::add(['sjId' => $sjId, 'shopId' => $shopId, 'time' => $time, 'riseNum' => 0, 'totalNum' => $shop->totalOrder], true);
+            $model = self::add(['sjId' => $sjId, 'shopId' => $shopId, 'time' => $time, 'riseNum' => 0, 'totalNum' => $main->totalOrder], true);
         }
         $id = $model->id;
 

console/controllers/SaleController.php

@@ -2,9 +2,11 @@
 
 namespace console\controllers;
 
+use biz\shop\classes\MainClass;
 use biz\shop\classes\ShopClass;
 use biz\stat\classes\StatSaleClass;
 use bizGhs\order\classes\OrderClass;
+use common\components\util;
 use yii\console\Controller;
 use Yii;
 
@@ -33,12 +35,17 @@ class SaleController extends Controller
                         echo '没有找到店铺 ' . $shopId . ' ' . $orderSn . "\n";
                         continue;
                     }
-                    $totalSale = bcadd($actPrice, $shop->totalSale, 2);
-                    $shop->totalSale = $totalSale;
-                    $shop->totalOrderNum += 1;
-                    $shop->save();
+                    $mainId = $shop->mainId ?? 0;
+                    $main = MainClass::getById($mainId, true);
+                    if (empty($main)) {
+                        util::fail('没有找到main信息');
+                    }
+                    $totalSale = bcadd($actPrice, $main->totalSale, 2);
+                    $main->totalSale = $totalSale;
+                    $main->totalOrderNum += 1;
+                    $main->save();
                     $date = date("Ymd", strtotime($addTime));
-                    StatSaleClass::replace($shop, $actPrice, $date);
+                    StatSaleClass::replace($main, $shop, $actPrice, $date);
                     $transaction->commit();
 
                 } catch (\Exception $e) {