1009

app/controller/common/Login.php

@@ -90,8 +90,9 @@ class Login extends Base
         if ($user['type'] > 1) {
             $typeUser = $this->getTypeUser($user['agent_id']);
             if (empty($typeUser)) return [0,trans("empty.agent"),[]];
-            if ($typeUser['status'] <> 1) return [0,trans("error.agent"),[]];
+            if ($typeUser['status'] <> 0) return [0,trans("error.agent"),[]];
             if (time() > strtotime($typeUser['vip_end'])) return [0,trans("error.agent-out"),[]];
+            $user['shop_name'] = $typeUser['shop_name'];
         }
         if ($type == 2) {
             if (md5($param['password'].$user['salt']) <> $user['password']) return [0,trans("error.passwd"),[]];
@@ -135,6 +136,7 @@ class Login extends Base
                 "vip_at"    => $userData['vip_end'],
                 "agent_id"  => $userData['agent_id'],
                 "super"     => $userData['is_super'],
+                "shop"      => $agent['shop_name']??'',
                 "type"      => $userData['type']
             ]);
         } catch (\Throwable $exception){

app/model/system/SystemUser.php

@@ -3,25 +3,26 @@
 namespace app\model\system;
 
 use app\extra\basic\Model;
+use think\model\relation\HasOne;
 
 
 /**
- * @property integer $id (主键)
- * @property integer $agent_id 代理ID
- * @property string $username 用户名
- * @property string $truename 真实姓名
- * @property string $password 密码
- * @property mixed $salt 密钥串
- * @property integer $status 状态
- * @property integer $type 1管理员2代理子账号3店铺账号
- * @property integer $is_deleted 删除状态
- * @property integer $is_super 
- * @property string $remark 备注
- * @property string $login_ip 登录IP
- * @property mixed $login_at 登录时间
- * @property integer $login_num 
- * @property string $create_ip 
- * @property mixed $updated_at 更新时间
+ * @property integer $id (主键)
+ * @property integer $agent_id 代理ID
+ * @property string $username 用户名
+ * @property string $truename 真实姓名
+ * @property string $password 密码
+ * @property mixed $salt 密钥串
+ * @property integer $status 状态
+ * @property integer $type 1管理员2代理子账号3店铺账号
+ * @property integer $is_deleted 删除状态
+ * @property integer $is_super 
+ * @property string $remark 备注
+ * @property string $login_ip 登录IP
+ * @property mixed $login_at 登录时间
+ * @property integer $login_num 
+ * @property string $create_ip 
+ * @property mixed $updated_at 更新时间
  * @property mixed $create_at 创建时间
  */
 class SystemUser extends Model
@@ -54,5 +55,9 @@ class SystemUser extends Model
      */
     public bool $timestamps = false;
 
+    public function account(): HasOne
+    {
+        return $this->hasOne("app\model\saas\SaasAgent","agent_id","agent_id");
+    }
 
 }