同时开通

app-ghs/controllers/AdminController.php

@@ -225,7 +225,8 @@ class AdminController extends BaseController
         //这个接口没有提供unionId，这边补充一下
         $wxInfo['unionId'] = $unionId;
         $wxInfo['mainId'] = $this->mainId;
-        $admin = AdminService::replaceAdmin($wxInfo, $source);
+
+        $admin = AdminClass::replaceAdmin($wxInfo, $source);
         $adminId = $admin['id'];
         $admin = AdminService::getAdminById($adminId);
         util::success($admin);

app-ghs/controllers/ApplyController.php

@@ -4,6 +4,7 @@ namespace ghs\controllers;
 
 use biz\shop\classes\ShopClass;
 use biz\sj\classes\SjClass;
+use bizGhs\admin\classes\AdminClass;
 use bizGhs\admin\services\AdminService;
 use bizHd\saas\services\ApplyService;
 use bizHd\wx\classes\WxOpenClass;
@@ -139,7 +140,7 @@ class ApplyController extends BaseController
             $miniOpenId = $post['miniOpenId'] ?? '';
             $adminInfo = ['name' => $adminName, 'mobile' => $mobile, 'style' => $ptStyle, 'miniOpenId' => $miniOpenId];
             $fromApp = dict::getDict('userSourceGetId', 'app', 'id');
-            $admin = AdminService::replaceAdmin($adminInfo, $fromApp);
+            $admin = AdminClass::replaceAdmin($adminInfo, $fromApp);
             $adminId = $admin['id'] ?? 0;
             $post['adminId'] = $adminId;
             $currentShopId = $admin['currentGhsShopId'] ?? 0;

app-ghs/controllers/AuthController.php

@@ -165,7 +165,7 @@ class AuthController extends PublicController
                 'style' => $ptStyle,
             ];
             $fromApp = dict::getDict('userSourceGetId', 'app', 'id');
-            $admin = AdminService::replaceAdmin($adminInfo, $fromApp);
+            $admin = \bizGhs\admin\classes\AdminClass::replaceAdmin($adminInfo, $fromApp);
         }
         $currentShopId = $admin['currentGhsShopId'] ?? 0;
         $openShop = $admin['openGhsShop'] ?? 1;

app-hd/controllers/AdminController.php

@@ -261,7 +261,8 @@ class AdminController extends BaseController
         $wxInfo['miniOpenId'] = $admin['miniOpenId'] ?? '';
         //这个接口没有提供unionId，这边补充一下
         $wxInfo['unionId'] = $unionId;
-        $admin = AdminService::replaceAdmin($wxInfo, $source);
+
+        $admin = \bizGhs\admin\classes\AdminClass::replaceAdmin($wxInfo, $source);
         $adminId = $admin['id'];
         $admin = AdminService::getAdminById($adminId);
         util::success($admin);

app-hd/controllers/ApplyController.php

@@ -5,6 +5,7 @@ namespace hd\controllers;
 use biz\shop\classes\ShopClass;
 use biz\shop\services\ShopAdminService;
 use biz\sj\classes\SjClass;
+use bizGhs\admin\classes\AdminClass;
 use bizGhs\admin\services\AdminService;
 use bizHd\saas\services\ApplyService;
 use bizHd\wx\classes\WxOpenClass;
@@ -147,7 +148,8 @@ class ApplyController extends BaseController
             $miniOpenId = $post['miniOpenId'] ?? '';
             $adminInfo = ['name' => $adminName, 'mobile' => $mobile, 'style' => $ptStyle, 'miniOpenId' => $miniOpenId];
             $fromApp = dict::getDict('userSourceGetId', 'app', 'id');
-            $admin = AdminService::replaceAdmin($adminInfo, $fromApp);
+
+            $admin = AdminClass::replaceAdmin($adminInfo, $fromApp);
             $adminId = $admin['id'] ?? 0;
             $currentShopId = $admin['currentShopId'] ?? 0;
             if (!empty($currentShopId)) {

app-pt/controllers/WxController.php

@@ -121,10 +121,6 @@ class WxController extends PublicController
                 switch ($Event) {
                     //关注
                     case 'subscribe':
-                        //$getUserInfo = wxUtil::userInfo($this->fromUsername, $merchant, $isOpen);
-                        //$source = UserClass::$userSourceId['official']['name'];
-                        //$getUserInfo['subscribe'] = 1;
-                        //AdminService::replaceAdmin($getUserInfo, $source);
                         $text = $this->replyTextContent("等您好久，终于等到您 /::)");
                         $pc = new \WXBizMsgCrypt($openToken, $encodingAesKey, $openAppId);
                         $encryptMsg = '';
@@ -174,10 +170,6 @@ class WxController extends PublicController
                 switch ($Event) {
                     //关注
                     case 'subscribe':
-                        //$getUserInfo = wxUtil::userInfo($this->fromUsername, $merchant, $isOpen);
-                        //$source = UserClass::$userSourceId['official']['name'];
-                        //$getUserInfo['subscribe'] = 1;
-                        //\bizGhs\admin\services\AdminService::replaceAdmin($getUserInfo, $source);
                         $text = $this->replyTextContent("等您好久，终于等到您 /::)");
                         $pc = new \WXBizMsgCrypt($openToken, $encodingAesKey, $openAppId);
                         $encryptMsg = '';

biz-ghs/admin/classes/AdminClass.php

@@ -64,7 +64,7 @@ class AdminClass extends BaseClass
     }
 
     //开店时初始化员工和角色
-    public static function initAdmin($applyData, $mainId, $shop)
+    public static function initAdmin($applyData, $mainId, $shop, $shop2 = null)
     {
         $shopId = $shop->id ?? 0;
         $mobile = $applyData['mobile'] ?? 0;
@@ -78,10 +78,18 @@ class AdminClass extends BaseClass
             if ($ptStyle == dict::getDict('ptStyle', 'hd')) {
                 $admin->openShop = 3;
                 $admin->currentShopId = $shopId;
+                if (!empty($shop2)) {
+                    $admin->openGhsShop = 3;
+                    $admin->currentGhsShopId = $shop2->id ?? 0;
+                }
                 $admin->save();
             } elseif ($ptStyle == dict::getDict('ptStyle', 'ghs')) {
                 $admin->openGhsShop = 3;
                 $admin->currentGhsShopId = $shopId;
+                if (!empty($shop2)) {
+                    $admin->openShop = 3;
+                    $admin->currentShopId = $shop2->id ?? 0;
+                }
                 $admin->save();
             }
         }
@@ -331,13 +339,13 @@ class AdminClass extends BaseClass
         $adminData['addTime'] = $time;
         $adminData['source'] = isset($adminData['source']) ? $adminData['source'] : 0;
         $adminData['hasSubscribe'] = 0;
-        $adminData['currentShopId'] = $adminData['currentShopId'] ?? '';
+        $adminData['currentShopId'] = $adminData['currentShopId'] ?? 0;
         $adminData['openShop'] = $adminData['openShop'] ?? \biz\admin\classes\AdminClass::OPEN_SHOP_NO;
-        $adminData['currentGhsShopId'] = $adminData['currentGhsShopId'] ?? '';
+        $adminData['currentGhsShopId'] = $adminData['currentGhsShopId'] ?? 0;
         $adminData['openGhsShop'] = $adminData['openGhsShop'] ?? \biz\admin\classes\AdminClass::OPEN_SHOP_NO;
         $adminData['super'] = $adminData['super'] ?? \biz\admin\classes\AdminClass::SUPER_NO;
         $adminData['delStatus'] = 0;
-        $adminData['openShop'] = 1;
+        $adminData['openShop'] = $adminData['openShop'] ?? \biz\admin\classes\AdminClass::OPEN_SHOP_NO;
         if (isset($adminData['headImgUrl']) && !empty($adminData['headImgUrl'])) {
             $imgUrl = $adminData['headImgUrl'];
             $name = ImageService::generateAvatar(0, $imgUrl);

biz-ghs/admin/services/AdminService.php

@@ -135,12 +135,6 @@ class AdminService extends BaseService
         return AdminClass::getByOpenId($openId);
     }
 
-    //添加更新客户 ssh 2020.2.7
-    public static function replaceAdmin($wxInfo, $source)
-    {
-        return AdminClass::replaceAdmin($wxInfo, $source);
-    }
-
     //取消关注 ssh 2020.4.19
     public static function unFocus($adminId)
     {

biz-hd/admin/classes/AdminClass.php

@@ -172,25 +172,6 @@ class AdminClass extends BaseClass
         return self::getByCondition(['unionId' => $unionId]);
     }
 
-    //创建以及更新用户 ssh 2020.2.7
-    public static function replaceAdmin($wxInfo, $source)
-    {
-        $wxInfo = self::switchAdminInfo($wxInfo, $source);
-        $unionId = $wxInfo['unionId'] ?? 0;
-        if (empty($unionId)) {
-            noticeUtil::push("创建用户时没有找到unionId，参数：" . json_encode($wxInfo), '15280215347');
-            util::fail('没有找到unionId');
-        }
-        $ptStyle = Yii::$app->params['ptStyle'];
-        $admin = self::getByCondition(['unionId' => $unionId, 'style' => $ptStyle]);
-        if (empty($admin)) {
-            $admin = self::generateAdmin($wxInfo);
-        } else {
-            $admin = self::updateAdmin($admin, $wxInfo);
-        }
-        return $admin;
-    }
-
     //更新员工信息 ssh 2020.5.30
     public static function updateAdmin($originalAdmin, $getAdminInfo)
     {

biz-hd/admin/services/AdminService.php

@@ -135,12 +135,6 @@ class AdminService extends BaseService
         return AdminClass::getByOpenId($openId);
     }
 
-    //添加更新客户 ssh 2020.2.7
-    public static function replaceAdmin($wxInfo, $source)
-    {
-        return AdminClass::replaceAdmin($wxInfo, $source);
-    }
-
     //取消关注 ssh 2020.4.19
     public static function unFocus($adminId)
     {

biz-hd/saas/services/ApplyService.php

@@ -81,7 +81,8 @@ class ApplyService extends BaseService
         $respond = [];
         $style = $apply['style'] ?? dict::getDict('ptStyle', 'hd');
         if ($style == dict::getDict('ptStyle', 'hd')) {
-            MerchantService::initGhsBaseInfo($apply, $main);
+            $ret = MerchantService::initGhsBaseInfo($apply, $main);
+            $shop2 = $ret['shop'] ?? [];
             $respond = MerchantService::initHdBaseInfo($apply, $main, true);
             $shop = $respond['shop'] ?? [];
             //员工、角色、商品、分类、培训班、花材等初始化
@@ -91,7 +92,7 @@ class ApplyService extends BaseService
             //商城和门店广告初始化
             AdClass::initAdd($mainId);
             //初始化员工和角色
-            \bizGhs\admin\classes\AdminClass::initAdmin($apply, $mainId, $shop);
+            \bizGhs\admin\classes\AdminClass::initAdmin($apply, $mainId, $shop, $shop2);
             //初始化花材
             \bizGhs\item\services\ItemService::initItem($mainId);
             //商家商品配置信息
@@ -101,14 +102,15 @@ class ApplyService extends BaseService
         } elseif ($style == dict::getDict('ptStyle', 'ghs')) {
             $respond = MerchantService::initGhsBaseInfo($apply, $main, true);
             $shop = $respond['shop'] ?? [];
-            MerchantService::initHdBaseInfo($apply, $main);
+            $ret = MerchantService::initHdBaseInfo($apply, $main);
+            $shop2 = $ret['shop'] ?? [];
 
             //商品和分类初始化
             CategoryClass::initCategoryGoods($mainId);
             //商城和门店广告初始化
             AdClass::initAdd($mainId);
             //初始化员工和角色
-            \bizGhs\admin\classes\AdminClass::initAdmin($apply, $mainId, $shop);
+            \bizGhs\admin\classes\AdminClass::initAdmin($apply, $mainId, $shop, $shop2);
             //初始化花材
             \bizGhs\item\services\ItemService::initItem($mainId);
             //商家商品配置信息