瀏覽代碼

feat: 新增sys_user_sub表

lixuesong 3 年之前
父節點
當前提交
a0aef9e7b1

+ 19 - 0
db/v2.0/220301.sql

@@ -0,0 +1,19 @@
+-- 用户签约认证主体信息表
+CREATE TABLE `sys_user_sub`
+(
+    `id`                INT    NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `user_id`           INT    NOT NULL COMMENT '用户ID',
+    `gig_type`          INT(2) NOT NULL COMMENT '零工平台类型',
+    `cert_status`       INT    NOT NULL COMMENT '认证状态',
+    `cert_remark`       VARCHAR(255) DEFAULT NULL COMMENT '认证结果描述',
+    `user_type`         VARCHAR(2)   DEFAULT NULL COMMENT '人员类型',
+    `bank_card_number`  VARCHAR(19)  DEFAULT NULL COMMENT '银行卡号',
+    `id_card_front_url` VARCHAR(255) DEFAULT NULL COMMENT '身份证照片-正面',
+    `id_card_back_url`  VARCHAR(255) DEFAULT NULL COMMENT '身份证照片-反面',
+    `create_time`       datetime     DEFAULT NULL COMMENT '创建时间',
+    `create_user`       INT          DEFAULT NULL COMMENT '创建人',
+    `update_time`       datetime     DEFAULT NULL COMMENT '更新时间',
+    `update_user`       INT          DEFAULT NULL COMMENT '更新人',
+    PRIMARY KEY (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8mb4 COMMENT = '用户签约认证主体信息表';

+ 5 - 0
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/UserVO.java

@@ -250,4 +250,9 @@ public class UserVO implements Serializable {
 	@ApiModelProperty(value="结算主体类型")
 	private Map<String, Integer> subjectTypeAndChannel;
 
+	/**
+	 * 用户签约认证主体信息列表
+	 */
+	private List<Map> userSubList;
+
 }

+ 10 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -41,6 +41,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysUserRole;
 import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
 import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
 import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
+import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
 import com.qunzhixinxi.hnqz.admin.entity.dto.CommonUserDTO;
 import com.qunzhixinxi.hnqz.admin.entity.input.UserCertificationInput;
 import com.qunzhixinxi.hnqz.admin.entity.model.excel.CommonUserExcelModel;
@@ -49,6 +50,7 @@ import com.qunzhixinxi.hnqz.admin.mapper.*;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptSubService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
+import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaAgentService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
 import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
@@ -97,6 +99,7 @@ public class SysUserController {
 	private final RedisTemplate redisTemplate;
 	private final SysUserRoleMapper sysUserRoleMapper;
 	private final QccService qccService;
+	private final SysUserSubService sysUserSubService;
 
 
 	private boolean isZbOrDbUsers(Integer[] roles) {
@@ -1455,6 +1458,13 @@ public class SysUserController {
 			});
 		}
 
+		// 封装用户签约认证主体信息
+		userVosPage.getRecords().forEach(userVO -> {
+			List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
+					.eq(SysUserSub::getUserId, userVO.getUserId()));
+			userVO.setUserSubList(BeanUtil.copyToList(userSubList, Map.class));
+		});
+
 		return R.ok(userVosPage);
 	}
 

+ 90 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/SysUserSub.java

@@ -0,0 +1,90 @@
+package com.qunzhixinxi.hnqz.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
+import com.qunzhixinxi.hnqz.admin.enums.UserSubCertStatusEnum;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 用户签约认证主体信息实体
+ *
+ * @author lixuesong
+ * @date 2022年03月01日 18:17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_user_sub")
+public class SysUserSub extends Model<SysUserSub> {
+
+	/**
+	 * 主键id
+	 */
+	@TableId
+	private Integer id;
+
+	/**
+	 * 用户id
+	 */
+	private Integer userId;
+
+	/**
+	 * 零工平台类型
+	 */
+	private GigTypeEnum gigType;
+
+	/**
+	 * 认证状态
+	 */
+	private UserSubCertStatusEnum certStatus;
+
+	/**
+	 * 认证结果描述
+	 */
+	private String certRemark;
+
+	/**
+	 * 人员类型
+	 */
+	private String userType;
+
+	/**
+	 * 银行卡号
+	 */
+	private String bankCardNumber;
+
+	/**
+	 * 身份证照片-正面
+	 */
+	private String idCardFrontUrl;
+
+	/**
+	 * 身份证照片-反面
+	 */
+	private String idCardBackUrl;
+
+	/**
+	 * 创建时间
+	 */
+	private LocalDateTime createTime;
+
+	/**
+	 * 更新时间
+	 */
+	private LocalDateTime updateTime;
+
+	/**
+	 * 创建人
+	 */
+	private Integer createUser;
+
+	/**
+	 * 更新人
+	 */
+	private Integer updateUser;
+
+}

+ 29 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/GigTypeEnum.java

@@ -0,0 +1,29 @@
+package com.qunzhixinxi.hnqz.admin.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 零工平台类型
+ *
+ * @author lixuesong
+ * @date 2022年03月02日 11:10
+ */
+@Getter
+@AllArgsConstructor
+public enum GigTypeEnum {
+
+	// 零工平台类型
+	RENLIJIA(0, "人力家"),
+	TAX_HELPER(1, "税邦云"),
+	YEE(2, "易联"),
+	OLADING(3, "自由职家");
+
+	@EnumValue
+	private int code;
+
+	@JsonValue
+	private String desc;
+}

+ 35 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/UserSubCertStatusEnum.java

@@ -0,0 +1,35 @@
+package com.qunzhixinxi.hnqz.admin.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * {@code TaxHelperCertStatus} 税邦云认证枚举
+ *
+ * @author Hengchen.Sun
+ * @author Li Xuesong
+ * @version 1.0.0
+ * @date 2021-02-24, 2022-03-02
+ * @since ver.1.0.0
+ */
+@Getter
+@AllArgsConstructor
+public enum UserSubCertStatusEnum {
+
+	// 认证状态
+	UN_CERT(10, "未认证"),                    // 未增员
+	ADD_MEMBER(11, "已增员"),                 // 未认证未绑卡
+	CHECKED_UNBIND(12, "已认证,未绑卡"),      // 已认证未绑卡
+	CHECKING_BIND(13, "认证中已绑卡"),         // 认证中已绑卡
+	CHECKING_UNBIND(14, "认证中未绑卡"),       // 认证中未绑卡
+	CERT(15, "已认证"),                    	 // 已认证已绑卡
+	UNCHECKED_BIND(16, "未认证已绑卡");        // 未认证已绑卡
+
+	@EnumValue
+	private int code;
+
+	@JsonValue
+	private String desc;
+}

+ 15 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/SysUserSubMapper.java

@@ -0,0 +1,15 @@
+package com.qunzhixinxi.hnqz.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户签约认证主体信息Mapper
+ *
+ * @author lixuesong
+ * @date 2022年03月01日 18:46
+ */
+@Mapper
+public interface SysUserSubMapper extends BaseMapper<SysUserSub> {
+}

+ 13 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysUserSubService.java

@@ -0,0 +1,13 @@
+package com.qunzhixinxi.hnqz.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
+
+/**
+ * 用户签约认证主体信息服务
+ *
+ * @author lixuesong
+ * @date 2022年03月01日 18:48
+ */
+public interface SysUserSubService extends IService<SysUserSub> {
+}

+ 17 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserSubServiceImpl.java

@@ -0,0 +1,17 @@
+package com.qunzhixinxi.hnqz.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
+import com.qunzhixinxi.hnqz.admin.mapper.SysUserSubMapper;
+import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 用户签约认证主体信息服务
+ *
+ * @author lixuesong
+ * @date 2022年03月01日 18:49
+ */
+@Service
+public class SysUserSubServiceImpl extends ServiceImpl<SysUserSubMapper, SysUserSub> implements SysUserSubService {
+}