获取客户

app-hd/controllers/ProductController.php

@@ -26,9 +26,6 @@ class ProductController extends BaseController
         $py = Yii::$app->request->get('py', '');
         $type = Yii::$app->request->get('type', '');
 
-        //访问店铺时用户增加最近访问的店铺 ssh 2021.3.1
-        AdminClass::addRecentShop($this->shopId, $this->admin);
-
         //获取所有当前供应商的分类 （全部、常用）
         //根据分类组装分类下的花材信息
         $classIds = ItemClassClass::getGhsItemClassAll($this->sjId);
@@ -115,37 +112,49 @@ class ProductController extends BaseController
         $get = Yii::$app->request->get();
         $id = $get['id'] ?? 0;
         $shopId = $get['shopId'] ?? 0;
-        if (empty($id)) {
-            if (!empty($this->shopId)) {
-                $ghs = GhsClass::build($shopId, $this->shopId, $this->sjId);
-                $sjId = $ghs['ghsSjId'] ?? 0;
+
+        $connection = Yii::$app->db;//事务处理
+        $transaction = $connection->beginTransaction();
+        try {
+
+            if (empty($id)) {
+                if (!empty($this->shopId)) {
+                    $ghs = GhsClass::build($shopId, $this->shopId, $this->sjId);
+                    $sjId = $ghs['ghsSjId'] ?? 0;
+                } else {
+                    $shop = ShopClass::getShopInfo($shopId);
+                    $sjId = $shop['merchantId'] ?? 0;
+                }
             } else {
-                $shop = ShopClass::getShopInfo($shopId);
-                $sjId = $shop['merchantId'] ?? 0;
+                $ghs = GhsClass::getGhsInfo($id);
+                $sjId = $ghs['ghsSjId'] ?? 0;
             }
-        } else {
-            $ghs = GhsClass::getGhsInfo($id);
-            $sjId = $ghs['ghsSjId'] ?? 0;
+            $transaction->commit();
+
+            //获取所有当前供应商的分类 （全部、常用）
+            //根据分类组装分类下的花材信息
+            $classIds = ItemClassClass::getGhsItemClassAll($sjId);
+            $where['merchantId'] = $sjId;
+            $where['shopId'] = $shopId;
+
+            $itemInfoData = ProductClass::getAllByCondition($where, null, "*");
+            $itemInfoData = ProductClass::groupProductInfo($itemInfoData);
+            //常用的itemIds
+            $oftenItemIds = ProductClass::getOftenItemIds($shopId);
+            //获取供应商下所有花材ID （itemIds）
+            $itemIdsInfo = ItemService::getGhsItemIds($this->sjId);
+
+            //dd($itemInfoData);
+            //组装数据： [{classId:'','className:'',child:[{itemInfoData}]}]
+            $data = ProductService::assembleData($classIds, $itemIdsInfo, $itemInfoData, $oftenItemIds, '');
+
+
+            util::success($data);
+        } catch (Exception $e) {
+            $transaction->rollBack();
+            util::fail();
         }
 
-        //获取所有当前供应商的分类 （全部、常用）
-        //根据分类组装分类下的花材信息
-        $classIds = ItemClassClass::getGhsItemClassAll($sjId);
-        $where['merchantId'] = $sjId;
-        $where['shopId'] = $shopId;
-
-        $itemInfoData = ProductClass::getAllByCondition($where, null, "*");
-        $itemInfoData = ProductClass::groupProductInfo($itemInfoData);
-        //常用的itemIds
-        $oftenItemIds = ProductClass::getOftenItemIds($shopId);
-        //获取供应商下所有花材ID （itemIds）
-        $itemIdsInfo = ItemService::getGhsItemIds($this->sjId);
-
-        //dd($itemInfoData);
-        //组装数据： [{classId:'','className:'',child:[{itemInfoData}]}]
-        $data = ProductService::assembleData($classIds, $itemIdsInfo, $itemInfoData, $oftenItemIds, '');
-
-        util::success($data);
     }
 
 }

biz-ghs/custom/classes/CustomClass.php

@@ -2,6 +2,7 @@
 
 namespace bizGhs\custom\classes;
 
+use biz\ghs\classes\GhsClass;
 use biz\shop\classes\ShopClass;
 use biz\sj\classes\MerchantClass;
 use biz\sj\classes\SjClass;
@@ -24,12 +25,11 @@ class CustomClass extends BaseClass
                 $has = CustomClass::getByCondition(['sjId' => $applyData['introSjId'], 'customSjId' => $sjId, 'customShopId' => $shopId]);
                 if (empty($has)) {
                     $customData = [
-                        'customSjId' => $sjId,
-                        'customShopId' => $shopId,
-                        'sjId' => $applyData['introSjId'],
+                        'customSjId' => $sjId,//零售商家id
+                        'customShopId' => $shopId,//零售门店id
+                        'sjId' => $applyData['introSjId'],//供货商id
                         'name' => $applyData['name'],
                         'mobile' => $applyData['mobile'],
-                        'isOpen' => 1,
                         'province' => $applyData['province'] ?? '',
                         'city' => $applyData['city'] ?? '',
                         'dist' => $applyData['dist'] ?? '',
@@ -39,6 +39,27 @@ class CustomClass extends BaseClass
                         'lat' => $applyData['lat'],
                     ];
                     CustomClass::addCustom($customData);
+                    $introShopId = $applyData['introShopId'] ?? 0;
+                    $ghsShop = ShopClass::getShopInfo($introShopId);
+                    if (empty($ghsShop)) {
+                        util::fail('没有找到门店');
+                    }
+                    $ghsData = [
+                        'ghsSjId' => $ghsShop['merchantId'],
+                        'ghsShopId' => $ghsShop['id'],
+                        'sjId' => $sjId,
+                        'shopId' => $sjId,
+                        'mobile' => $ghsShop['mobile'] ?? '',
+                        'province' => $ghsShop['province'] ?? '',
+                        'city' => $ghsShop['city'] ?? '',
+                        'dist' => $ghsShop['dist'] ?? '',
+                        'address' => $ghsShop['address'] ?? '',
+                        'floor' => $ghsShop['floor'] ?? '',
+                        'fullAddress' => $ghsShop['fullAddress'] ?? '',
+                        'lat' => $ghsShop['lat'] ?? '',
+                        'long' => $ghsShop['long'] ?? '',
+                    ];
+                    GhsClass::addGhs($ghsData);
                 }
             }
         }
@@ -53,9 +74,9 @@ class CustomClass extends BaseClass
                     $super = ShopClass::getSuper($introShopId);
                     $mobile = $super['mobile'] ?? '';
                     $customData = [
-                        'customSjId' => $introSjId,
-                        'customShopId' => $introShopId,
-                        'sjId' => $sjId,
+                        'customSjId' => $introSjId,//零售商id
+                        'customShopId' => $introShopId,//零售门店id
+                        'sjId' => $sjId,//供货商id
                         'name' => $name,
                         'mobile' => $mobile,
                         'isOpen' => 1,
@@ -68,6 +89,28 @@ class CustomClass extends BaseClass
                         'lat' => $applyData['lat'],
                     ];
                     CustomClass::addCustom($customData);
+
+                    $ghsShop = ShopClass::getShopInfo($shopId);
+                    if (empty($ghsShop)) {
+                        util::fail('没有找到门店');
+                    }
+
+                    $ghsData = [
+                        'ghsSjId' => $sjId,
+                        'ghsShopId' => $shopId,
+                        'sjId' => $introSjId,
+                        'shopId' => $introShopId,
+                        'mobile' => $ghsShop['mobile'] ?? '',
+                        'province' => $ghsShop['province'] ?? '',
+                        'city' => $ghsShop['city'] ?? '',
+                        'dist' => $ghsShop['dist'] ?? '',
+                        'address' => $ghsShop['address'] ?? '',
+                        'floor' => $ghsShop['floor'] ?? '',
+                        'fullAddress' => $ghsShop['fullAddress'] ?? '',
+                        'lat' => $ghsShop['lat'] ?? '',
+                        'long' => $ghsShop['long'] ?? '',
+                    ];
+                    GhsClass::addGhs($ghsData);
                 }
             }
         }

biz/ghs/classes/GhsClass.php

@@ -5,7 +5,9 @@ namespace biz\ghs\classes;
 use biz\shop\classes\ShopClass;
 use biz\shop\services\ShopService;
 use biz\sj\classes\MerchantAssetClass;
+use bizGhs\custom\classes\CustomClass;
 use common\components\imgUtil;
+use common\components\stringUtil;
 use common\components\util;
 use biz\base\classes\BaseClass;
 
@@ -21,25 +23,50 @@ class GhsClass extends BaseClass
         if (!empty($ghs)) {
             return $ghs;
         }
-        $shop = ShopClass::getShopInfo($ghsShopId);
-        if (empty($shop)) {
-            util::fail('没有找到供货商的门店');
+        $ghsShop = ShopClass::getShopInfo($ghsShopId);
+        if (empty($ghsShop)) {
+            util::fail('没有找到供货商门店');
         }
+        $name = $ghsShop['merchantName'] . ' ' . $ghsShop['shopName'];
+        $py = stringUtil::getSpelling($name);
         $data = [
-            'ghsSjId' => $shop['merchantId'],
+            'ghsSjId' => $ghsShop['merchantId'],
             'ghsShopId' => $ghsShopId,
             'sjId' => $sjId,
-            'shopId' => $shopId,
-            'mobile' => $shop['mobile'] ?? '',
-            'province' => $shop['province'] ?? '',
+            'name' => $name,
+            'py' => $py,
+            'shopId' => $ghsShopId,
+            'mobile' => $ghsShop['mobile'] ?? '',
+            'province' => $ghsShop['province'] ?? '',
+            'city' => $ghsShop['city'] ?? '',
+            'dist' => $ghsShop['dist'] ?? '',
+            'address' => $ghsShop['address'] ?? '',
+            'floor' => $ghsShop['floor'] ?? '',
+            'fullAddress' => $ghsShop['fullAddress'] ?? '',
+            'lat' => $ghsShop['lat'] ?? '',
+            'long' => $ghsShop['long'] ?? '',
+        ];
+        $shop = ShopClass::getShopInfo($shopId);
+        $name = $shop['merchantName'] . ' ' . $shop['shopName'];
+        $py = stringUtil::getSpelling($name);
+        $mobile = $shop['mobile'] ?? '';
+
+        $customData = [
+            'customSjId' => $sjId,
+            'customShopId' => $shopId,
+            'sjId' => $ghsShop['merchantId'],
+            'name' => $name,
+            'py' => $py,
+            'mobile' => $mobile,
             'city' => $shop['city'] ?? '',
             'dist' => $shop['dist'] ?? '',
             'address' => $shop['address'] ?? '',
-            'floor' => $shop['floor'] ?? '',
             'fullAddress' => $shop['fullAddress'] ?? '',
-            'lat' => $shop['lat'] ?? '',
             'long' => $shop['long'] ?? '',
+            'lat' => $shop['lat'] ?? '',
         ];
+        CustomClass::addCustom($customData);
+
         return self::addGhs($data);
     }
 

sql.sql

@@ -2172,4 +2172,8 @@ ADD INDEX `idx_addTime` (`addTime`) ;
 
 ====shish 20210422
 ALTER TABLE `xhSj` ADD parentShopId INT NOT NULL DEFAULT 0 COMMENT '父级门店' AFTER parentId;
-ALTER TABLE `xhSj` MODIFY `parentId` INT(11) NOT NULL DEFAULT '0' COMMENT '父级商家id，介绍人';
+ALTER TABLE `xhSj` MODIFY `parentId` INT(11) NOT NULL DEFAULT '0' COMMENT '父级商家id，介绍人';
+ALTER TABLE `xhShop` ADD mobile VARCHAR(15) NOT NULL DEFAULT '' COMMENT '手机号' AFTER `totalStudent`;
+ALTER TABLE xhGhsCustom MODIFY `isOpen` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '已开店 0没有 1有';
+ALTER TABLE `xhGhsCustom` ADD UNIQUE INDEX `custom`(`sjId`,`customSjId`,`customShopId`);
+ALTER TABLE `xhGhs` ADD UNIQUE INDEX `ghs`(`sjId`,`ghsSjId`,`ghsShopId`);