零售开新店

biz-ghs/apply/services/ApplyService.php

@@ -2,8 +2,10 @@
 
 namespace bizGhs\apply\services;
 
+use biz\shop\classes\ShopClass;
 use bizGhs\apply\classes\ApplyClass;
 use bizGhs\merchant\services\MerchantService;
+use bizGhs\shop\classes\MainClass;
 use bizHd\merchant\services\SjService;
 use common\components\util;
 use bizGhs\base\services\BaseService;
@@ -22,23 +24,34 @@ class ApplyService extends BaseService
         }
         $applyId = $apply['id'];
         $live = isset($apply['live']) ? $apply['live'] : 1;
+
+        $mobile = $apply['mobile'] ?? '';
+        if (empty($mobile)) {
+            util::fail('没有找到手机号');
+        }
+        $lsShop = ShopClass::getByCondition(['mobile' => $mobile, 'ptStyle' => 1], true);
+        if (empty($lsShop)) {
+            $main = MainClass::addMain();
+            $ret = SjService::initHdBaseInfo($apply, $main);
+            $lsShop = $ret['shop'] ?? [];
+        } else {
+            $mainId = $lsShop->mainId ?? 0;
+            $main = MainClass::getById($mainId, true);
+            if (empty($main)) {
+                util::fail('没有main信息');
+            }
+        }
         ApplyClass::updateById($applyId, ['status' => ApplyClass::STATUS_PASS, 'remark' => $remark]);
         $apply['name'] = isset($apply['name']) ? $apply['name'] : '';
-        //初始化常用花材
-        $main = \bizGhs\shop\classes\MainClass::addMainInitItem($live);
-
+        //初始化或更新花材
+        MainClass::addMainInitItem($main, $live);
         $respond = MerchantService::initGhsBaseInfo($apply, $main, true);
-        $shop = $respond['shop'] ?? [];
-
-        $ret = SjService::initHdBaseInfo($apply, $main);
-        $shop2 = $ret['shop'] ?? [];
-
-        $shop2->pfShopId = $shop->id ?? 0;
-        $shop2->save();
-
-        $shop->lsShopId = $shop2->id ?? 0;
-        $shop->save();
+        $pfShop = $respond['shop'] ?? [];
 
+        $lsShop->pfShopId = $pfShop->id ?? 0;
+        $lsShop->save();
+        $pfShop->lsShopId = $lsShop->id ?? 0;
+        $pfShop->save();
         return $respond;
     }
 

biz-ghs/item/classes/ItemClass.php

@@ -78,8 +78,16 @@ class ItemClass extends BaseClass
     }
 
     //初始化花材 lqh 2021.4.12  modify ssh 20210711
-    public static function initItem($mainId)
+    public static function initUpdateItem($mainId)
     {
+        //增加默认分类
+        $classData = ['mainId' => $mainId, 'name' => '默认分类', 'inTurn' => -1, 'isDefault' => 1,];
+        $default = ItemClassClass::add($classData, true);
+        $defaultId = $default->id ?? 0;
+        ProductClass::updateByCondition(['mainId' => $mainId], ['classId' => $defaultId]);
+
+        $hasExistsProduct = ProductClass::getAllByCondition(['mainId' => $mainId], null, '*', 'itemId', true);
+
         $ptClass = PtItemCatClass::getAllList("*", ['type' => 0], 'inTurn desc');
         if (empty($ptClass)) {
             return false;
@@ -126,6 +134,14 @@ class ItemClass extends BaseClass
                     continue;
                 }
                 $currentItem = $itemInfo[$currentId] ?? [];
+                $ptItemId = $currentItem['id'];
+                //零售开批发店，已经存在的花材，不需要重复新建，只要修改分类
+                if (isset($hasExistsProduct[$ptItemId])) {
+                    $hasExists = $hasExistsProduct[$ptItemId];
+                    $hasExists->classId = $ghsClassId;
+                    $hasExists->save();
+                    continue;
+                }
 
                 unset($currentItem['addTime']);
                 unset($currentItem['updateTime']);
@@ -154,9 +170,6 @@ class ItemClass extends BaseClass
             }
             ProductClass::batchAdd($productAddData);
         }
-        //增加默认分类
-        $classData = ['mainId' => $mainId, 'name' => '默认分类', 'inTurn' => -1, 'isDefault' => 1,];
-        ItemClassClass::add($classData);
     }
 
     //从首店复制花材和分类 ssh 20220522

biz-ghs/shop/classes/MainClass.php

@@ -17,13 +17,12 @@ class MainClass extends BaseClass
     }
 
     //首次开店时创建main并初始化花材 ssh 20220502
-    public static function addMainInitItem($live = 1)
+    public static function addMainInitItem($main, $live = 1)
     {
-        $main = self::addMain();
-        $newMainId = $main->id ?? 0;
+        $mainId = $main->id ?? 0;
         //活的商家要生成花材，虚拟的商家不需要
         if ($live == 1) {
-            ItemClass::initItem($newMainId);
+            ItemClass::initUpdateItem($mainId);
         }
         return $main;
     }

biz-hd/saas/services/ApplyService.php

@@ -2,7 +2,6 @@
 
 namespace bizHd\saas\services;
 
-use biz\shop\classes\MainClass;
 use biz\sj\classes\SjClass;
 use bizHd\ad\classes\AdClass;
 use bizHd\admin\classes\AdminClass;
@@ -17,6 +16,7 @@ use bizHd\merchant\services\SjService;
 use bizHd\saas\classes\ApplyClass;
 use bizHd\saas\classes\ApplyExtendClass;
 use biz\sj\services\MerchantService;
+use bizHd\shop\classes\MainClass;
 use common\components\dict;
 use common\components\imgUtil;
 use common\components\noticeUtil;
@@ -77,7 +77,8 @@ class ApplyService extends BaseService
         $applyId = $apply['id'];
         ApplyClass::updateById($applyId, ['status' => ApplyClass::STATUS_PASS, 'remark' => $remark]);
         $apply['name'] = isset($apply['name']) ? $apply['name'] : '';
-        $main = \bizHd\shop\classes\MainClass::addMainInitItem();
+        $main = MainClass::addMain();
+        MainClass::addMainInitItem($main);
         $respond = SjService::initHdBaseInfo($apply, $main, true);
         return $respond;
     }

biz-hd/shop/classes/MainClass.php

@@ -17,11 +17,10 @@ class MainClass extends BaseClass
     }
 
     //创建main并初始化花材 ssh 20220502
-    public static function addMainInitItem()
+    public static function addMainInitItem($main)
     {
-        $main = self::addMain();
-        $newMainId = $main->id ?? 0;
-        ItemClass::initItem($newMainId);
+        $mainId = $main->id ?? 0;
+        ItemClass::initItem($mainId);
         return $main;
     }
 
@@ -29,8 +28,8 @@ class MainClass extends BaseClass
     public static function addMainCopyItem($beforeMainId)
     {
         $main = self::addMain();
-        $newMainId = $main->id ?? 0;
-        ItemClass::copyItem($beforeMainId, $newMainId);
+        $mainId = $main->id ?? 0;
+        ItemClass::copyItem($beforeMainId, $mainId);
         return $main;
     }
 

console/controllers/ItemController.php

@@ -56,12 +56,6 @@ class ItemController extends Controller
         echo "ok\n";
     }
 
-    //重新生成花材 ssh 20230920
-    public function actionCreateItem()
-    {
-        //ItemClass::initItem(10449);
-    }
-
     //包装纸丝带同步 ssh 20230525
     public function actionPaperSync()
     {