修改用户表

src/entity/User.entity.ts

@@ -5,6 +5,8 @@ import isString = require('lodash/isString');
   schemaOptions: { collection: 'User' },
 })
 export class User extends BaseModel {
+  @prop({ required: false, index: false, zh: '头像' })
+  icon: Array<any>;
   @prop({ required: true, index: true, zh: '姓名' })
   name: string;
   @prop({ required: true, index: true, zh: '联系电话' })
@@ -31,7 +33,7 @@ export class User extends BaseModel {
     remark: '0:男;1女;2未知',
     default: '2',
   })
-  gender: number;
+  gender: string;
   @prop({ required: false, index: true, zh: '角色' })
   role: string;
   @prop({ required: false, index: true, zh: '所属街道' })

src/interface/User.interface.ts

@@ -18,6 +18,8 @@ export class FVO_User {
   }
   @ApiProperty({ description: '数据id' })
   _id: string = undefined;
+  @ApiProperty({ description: '头像' })
+  'icon': Array<any> = undefined;
   @ApiProperty({ description: '姓名' })
   'name': string = undefined;
   @ApiProperty({ description: '联系电话' })
@@ -25,7 +27,7 @@ export class FVO_User {
   @ApiProperty({ description: '密码' })
   'password': string = undefined;
   @ApiProperty({ description: '性别' })
-  'gender': number = undefined;
+  'gender': string = undefined;
   @ApiProperty({ description: '角色' })
   'role': string = undefined;
   @ApiProperty({ description: '所属街道' })
@@ -58,7 +60,7 @@ export class QDTO_User extends SearchBase {
   @ApiProperty({ description: '联系电话' })
   'tel': string = undefined;
   @ApiProperty({ description: '性别' })
-  'gender': number = undefined;
+  'gender': string = undefined;
   @ApiProperty({ description: '角色' })
   'role': string = undefined;
   @ApiProperty({ description: '所属街道' })
@@ -77,6 +79,9 @@ export class QVO_User extends FVO_User {
 }
 
 export class CDTO_User {
+  @ApiProperty({ description: '头像' })
+  @Rule(RuleType['array']().empty(''))
+  'icon': Array<any> = undefined;
   @ApiProperty({ description: '姓名' })
   @Rule(
     RuleType['string']()
@@ -96,11 +101,11 @@ export class CDTO_User {
   'password': string = undefined;
   @ApiProperty({ description: '性别' })
   @Rule(
-    RuleType['number']()
+    RuleType['string']()
       .required()
       .error(new ServiceError('缺少性别', FrameworkErrorEnum.NEED_BODY))
   )
-  'gender': number = undefined;
+  'gender': string = undefined;
   @ApiProperty({ description: '角色' })
   @Rule(
     RuleType['string']()
@@ -156,12 +161,16 @@ export class LoginVO {
       this[key] = get(data, key);
     }
   }
+  @ApiProperty({ description: '数据id' })
+  _id: string = undefined;
+  @ApiProperty({ description: '头像' })
+  'icon': Array<any> = undefined;
   @ApiProperty({ description: '姓名' })
   'name': string = undefined;
   @ApiProperty({ description: '联系电话' })
   'tel': string = undefined;
   @ApiProperty({ description: '性别' })
-  'gender': number = undefined;
+  'gender': string = undefined;
   @ApiProperty({ description: '角色' })
   'role': string = undefined;
   @ApiProperty({ description: '所属街道' })

src/interface/util/user.util.interface.ts

@@ -5,4 +5,5 @@ export interface CheckUpdateCardAndPid {
 export interface checkPhoneAndPid {
   tel?: string;
   name?: string;
+  openid?: string;
 }

src/service/user.service.ts

@@ -17,7 +17,9 @@ export class UserService extends BaseService<modelType> {
 
   async findUserToLogin(data: LoginDTO): Promise<object> {
     const { tel, password } = data;
-    const user = await this.model.findOne({ tel }, '+password').lean();
+    const user = await this.model
+      .findOne({ tel, status: '1' }, '+password')
+      .lean();
     if (!user)
       throw new ServiceError(
         '未找到用户信息',

src/service/util/user.util.ts

@@ -27,6 +27,8 @@ export class UserUtilService {
           FrameworkErrorEnum.BAD_BODY
         );
       }
+    }
+    if (data.name) {
       // 检查姓名
       const username = await this.UserModel.count({ name: data.name });
       if (username > 0) {
@@ -36,6 +38,30 @@ export class UserUtilService {
         );
       }
     }
+    if (data.openid) {
+      // 检查opneid
+      let openidan;
+      openidan = await this.UserModel.count({
+        openid: data.openid,
+        status: '0',
+      });
+      if (openidan > 0) {
+        throw new ServiceError(
+          '注册成功 管理员审核中！',
+          FrameworkErrorEnum.BAD_BODY
+        );
+      }
+      openidan = await this.UserModel.count({
+        openid: data.openid,
+        status: '1',
+      });
+      if (openidan > 0) {
+        throw new ServiceError(
+          '已有用户信息 请直接登录！',
+          FrameworkErrorEnum.BAD_BODY
+        );
+      }
+    }
   }
   /**
    * 检查创建时,检查手机号和姓名