main

app-ghs/controllers/BaseController.php

@@ -2,14 +2,13 @@
 
 namespace ghs\controllers;
 
-use biz\admin\classes\AdminClass;
-use biz\shop\classes\MainClass;
 use biz\shop\classes\ShopAdminClass;
 use biz\shop\classes\ShopClass;
 use biz\shop\classes\ShopExtClass;
 use biz\sj\classes\SjClass;
 use biz\sj\services\MerchantExtendService;
 use bizGhs\admin\services\AdminService;
+use bizGhs\shop\classes\MainClass;
 use common\components\dict;
 use common\components\jwt;
 use Yii;

app-hd/controllers/BaseController.php

@@ -2,12 +2,12 @@
 
 namespace hd\controllers;
 
-use biz\shop\classes\MainClass;
 use biz\sj\classes\SjClass;
 use bizHd\admin\classes\AdminClass;
 use biz\shop\classes\ShopAdminClass;
 use biz\sj\classes\MerchantExtendClass;
 use bizHd\merchant\services\ShopService;
+use bizHd\shop\classes\MainClass;
 use common\components\dict;
 use common\components\jwt;
 use Yii;

biz-ghs/merchant/classes/ShopClass.php

@@ -47,12 +47,12 @@ class ShopClass extends BaseClass
         if (empty($defaultShop)) {
             util::fail('没有找到门店');
         }
-        $defaultMainId = $defaultShop->mainId ?? 0;
-        if (empty($defaultMainId)) {
+        $oldMainId = $defaultShop->mainId ?? 0;
+        if (empty($oldMainId)) {
             util::fail('没有找到main信息');
         }
         //创建main并复制花材
-        $main = MainClass::addMainCopyItem($defaultMainId);
+        $main = MainClass::addMainCopyItem($oldMainId);
         $mainId = $main->id ?? 0;
         $data['mainId'] = $mainId;
 

biz-hd/shop/classes/ShopClass.php

@@ -67,11 +67,11 @@ class ShopClass extends BaseClass
         if (empty($defaultShop)) {
             util::fail('没有找到门店');
         }
-        $defaultMainId = $defaultShop->mainId ?? 0;
-        if (empty($defaultMainId)) {
+        $oldMainId = $defaultShop->mainId ?? 0;
+        if (empty($oldMainId)) {
             util::fail('没有找到main信息');
         }
-        $main = MainClass::addMainCopyItem($defaultMainId);
+        $main = MainClass::addMainCopyItem($oldMainId);
         $mainId = $main->id ?? 0;
         $data['mainId'] = $mainId;
         $newShop = self::addShop($data);