更新

app-ghs/controllers/AdminController.php

@@ -199,12 +199,13 @@ class AdminController extends BaseController
         $encryptedData = isset($post['encryptedData']) ? $post['encryptedData'] : '';
         $merchant = WxOpenClass::getGhsWxInfo();
         $appId = $merchant['miniAppId'];
-        $admin = $this->admin->attributes;
-        $miniOpenId = $admin['miniOpenId'];
+        $admin = $this->admin;
+        $adminId = $this->adminId;
+        $miniOpenId = $admin->ghsMiniOpenId;
         if (empty($miniOpenId)) {
             util::fail('没有找到管理员信息(miniOpenId)');
         }
-        $unionId = $admin['unionId'] ?? '';
+        $unionId = $admin->unionId ?? '';
         if (empty($unionId)) {
             util::fail('没有找到管理员信息(unionId)');
         }
@@ -221,13 +222,11 @@ class AdminController extends BaseController
         Yii::info('小程序获取用户信息：' . $result);
         $wxInfo = Json::decode($result);
         $source = UserClass::$userSourceId['mini']['name'];
-        $wxInfo['miniOpenId'] = $admin['miniOpenId'] ?? '';
-        //这个接口没有提供unionId，这边补充一下
+        $wxInfo['ghsMiniOpenId'] = $admin->ghsMiniOpenId ?? '';
         $wxInfo['unionId'] = $unionId;
         $wxInfo['mainId'] = $this->mainId;
-
-        $admin = AdminClass::replaceAdmin($wxInfo, $source);
-        $adminId = $admin['id'];
+        //更新
+        AdminClass::replaceAdmin($wxInfo, $source);
         $admin = AdminService::getAdminById($adminId);
         util::success($admin);
     }

app-ghs/controllers/ApplyController.php

@@ -138,7 +138,7 @@ class ApplyController extends BaseController
             }
             $adminName = $post['adminName'] ?? '';
             $miniOpenId = $post['miniOpenId'] ?? '';
-            $adminInfo = ['name' => $adminName, 'mobile' => $mobile, 'style' => $ptStyle, 'miniOpenId' => $miniOpenId];
+            $adminInfo = ['name' => $adminName, 'mobile' => $mobile, 'style' => $ptStyle, 'ghsMiniOpenId' => $miniOpenId];
             $fromApp = dict::getDict('userSourceGetId', 'app', 'id');
             $admin = AdminClass::replaceAdmin($adminInfo, $fromApp);
             $adminId = $admin['id'] ?? 0;

app-ghs/controllers/RenewController.php

@@ -57,7 +57,7 @@ class RenewController extends BaseController
         $totalFee = $actPrice;
         $admin = $this->admin->attributes;
         //小程序使用miniOpenId
-        $openId = $admin['miniOpenId'];
+        $openId = $admin['ghsMiniOpenId'];
 
         $capitalType = dict::getDict('capitalType', 'xhRenew', 'id');
         //将流水类型、优惠卷传过去

biz-hd/saas/services/ApplyService.php

@@ -86,7 +86,7 @@ class ApplyService extends BaseService
             $respond = MerchantService::initHdBaseInfo($apply, $main, true);
             $shop = $respond['shop'] ?? [];
             $sj = $respond['sj'] ?? [];
-            $sjId = $sj['id'] ?? 0;
+            $sjId = $sj->id ?? 0;
             //员工、角色、商品、分类、培训班、花材等初始化
 
             //商品和分类初始化
@@ -107,7 +107,7 @@ class ApplyService extends BaseService
             $ret = MerchantService::initHdBaseInfo($apply, $main);
             $shop2 = $ret['shop'] ?? [];
             $sj2 = $ret['sj'] ?? [];
-            $sjId2 = $sj2['id'] ?? 0;
+            $sjId2 = $sj2->id ?? 0;
 
             //商品和分类初始化
             CategoryClass::initCategoryGoods($mainId, $sjId2);