企业端信息处理

app/adminapi/logic/firm/FirmRegisterLogic.php

@@ -76,14 +76,18 @@ class FirmRegisterLogic extends BaseLogic
             $firmRegister =   FirmRegister::where('id', $params['id'])->findOrEmpty();
             if(!$firmRegister->isEmpty()){
                 $firmRegister->status = $params['status'];
-                $firmRegister->save();
                 if($params['status'] === YesNoEnum::YES){
                     $user = User::findOrEmpty($firmRegister->user_id);
                     if($user->isEmpty()){
-                        $user->user_type = YesNoEnum::YES;
-                        $user->save();
+                        throw new \Exception('用户不存在');
+                    }
+                    if($user->user_type ===  YesNoEnum::YES){
+                        throw new \Exception('已经绑定过企业用户了');
                     }
+                    $user->user_type = YesNoEnum::YES;
+                    $user->save();
                 }
+                $firmRegister->save();
             }
             Db::commit();
             return true;

app/api/logic/UserLogic.php

@@ -21,6 +21,7 @@ use app\common\{enum\notice\NoticeEnum,
     logic\BaseLogic,
     model\coupon\UserCoupon,
     model\equity\UserEquity,
+    model\firm\FirmRegister,
     model\orders\OrderEffectiveLog,
     model\user\User,
     model\user\UserAuth,
@@ -78,8 +79,11 @@ class UserLogic extends BaseLogic
     public static function info(int $userId)
     {
         $user = User::where(['id' => $userId])
-            ->field('id,sn,sex,account,password,nickname,real_name,avatar,mobile,create_time,user_money')
+            ->field('id,sn,sex,account,password,nickname,real_name,avatar,mobile,create_time,user_money,user_type')
             ->findOrEmpty();
+        if(!$user->isEmpty() && $user->user_type === YesNoEnum::YES){
+            $user->firmRegister = FirmRegister::where(['user_id'=>$userId,'status'=>YesNoEnum::YES])->findOrEmpty();
+        }
         $user['has_password'] = !empty($user['password']);
         $user['has_auth'] = self::hasWechatAuth($userId);
         $user['version'] = config('project.version');