feat: userinfo查询certList修改

hnqz-common/hnqz-common-taxhelper/src/main/java/com/qunzhixinxi/hnqz/common/taxhelper/enums/TaxHelperCertStatus.java

@@ -26,4 +26,20 @@ public enum TaxHelperCertStatus {
 	private int code;
 
 	private String desc;
+
+	/**
+	 * 根据枚举编码获取枚举对象
+	 *
+	 * @param code 枚举编码
+	 * @return 如果存在返回枚举，否则返回 {@code null}
+	 */
+	public static TaxHelperCertStatus resolve(final int code) {
+		for (TaxHelperCertStatus certStatus : TaxHelperCertStatus.values()) {
+			if (certStatus.getCode() == code) {
+				return certStatus;
+			}
+		}
+		return UN_CERT;
+
+	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -53,6 +53,7 @@ import com.qunzhixinxi.hnqz.admin.entity.input.NoticeApiInput;
 import com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageApiInput;
 import com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageApiOutput;
 import com.qunzhixinxi.hnqz.admin.entity.input.WmWkAlbumApiInput;
+import com.qunzhixinxi.hnqz.admin.entity.vo.SysUserSubVO;
 import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.PackageTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
@@ -747,18 +748,8 @@ public class ApiController {
 				mapOne.put("subjectTypeAndChannel", collect);
 
 				// 认证服务信息回显
-				List<SysUserSub> userSignCertList = sysUserSignCertService.listUserSignCert(sysU.getUserId());
+				List<SysUserSubVO> userSignCertList = sysUserSignCertService.listUserSignCertForApi(sysU.getUserId());
 				mapOne.put("certList", userSignCertList);
-				// 是否需要人身认证
-				if (CollUtil.isNotEmpty(userSignCertList)) {
-					long personalIdentityCount = userSignCertList.stream()
-							.filter(sysUserSub -> StrUtil.isAllNotBlank(sysUserSub.getIdCardFrontUrl(),
-									sysUserSub.getIdCardBackUrl(), sysUserSub.getCertVideo1Url(), sysUserSub.getCertVideo2Url()))
-							.count();
-					mapOne.put("isPersonalIdentity", personalIdentityCount > 0);
-				} else {
-					mapOne.put("isPersonalIdentity", false);
-				}
 
 				list.add(mapOne);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/vo/SysUserSubVO.java

@@ -0,0 +1,113 @@
+package com.qunzhixinxi.hnqz.admin.entity.vo;
+
+import com.qunzhixinxi.hnqz.admin.enums.GigChannelEnum;
+import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 用户签约认证主体信息实体
+ *
+ * @author lixuesong
+ * @date 2022年03月01日 18:17
+ */
+@Data
+public class SysUserSubVO {
+
+	/**
+	 * 主键id
+	 */
+	private Integer id;
+
+	/**
+	 * 用户id
+	 */
+	private Integer userId;
+
+	/**
+	 * 部门id
+	 */
+	private Integer deptId;
+
+	/**
+	 * 零工平台类型（订单支付方式类型）
+	 */
+	private GigTypeEnum gigType;
+
+	/**
+	 * 渠道
+	 */
+	private GigChannelEnum gigChannel;
+
+	/**
+	 * 认证状态
+	 */
+	private String certStatus;
+
+	/**
+	 * 认证结果描述
+	 */
+	private String certRemark;
+
+	/**
+	 * 人员类型
+	 */
+	private String userType;
+
+	/**
+	 * 银行预留手机号
+	 */
+	private String bankPhone;
+
+	/**
+	 * 银行卡号
+	 */
+	private String bankCardNumber;
+
+	/**
+	 * 身份证照片-正面
+	 */
+	private String idCardFrontUrl;
+
+	/**
+	 * 身份证照片-反面
+	 */
+	private String idCardBackUrl;
+
+	/**
+	 * 认证视频1
+	 */
+	private String certVideo1Url;
+
+	/**
+	 * 认证视频2
+	 */
+	private String certVideo2Url;
+
+	/**
+	 * 协议
+	 */
+	private String agreementUrl;
+
+	/**
+	 * 创建时间
+	 */
+	private LocalDateTime createTime;
+
+	/**
+	 * 更新时间
+	 */
+	private LocalDateTime updateTime;
+
+	/**
+	 * 创建人
+	 */
+	private Integer createUser;
+
+	/**
+	 * 更新人
+	 */
+	private Integer updateUser;
+
+}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/RenlijiaCertStatus.java

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.enums;
 
+import com.qunzhixinxi.hnqz.common.taxhelper.enums.TaxHelperCertStatus;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -22,4 +23,20 @@ public enum RenlijiaCertStatus {
 	private final int code;
 
 	private final String message;
+
+	/**
+	 * 根据枚举编码获取枚举对象
+	 *
+	 * @param code 枚举编码
+	 * @return 如果存在返回枚举，否则返回 {@code null}
+	 */
+	public static RenlijiaCertStatus resolve(final int code) {
+		for (RenlijiaCertStatus certStatus : RenlijiaCertStatus.values()) {
+			if (certStatus.getCode() == code) {
+				return certStatus;
+			}
+		}
+		return CER_STATUS_4;
+
+	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/YeeCertStatus.java

@@ -36,7 +36,7 @@ public enum YeeCertStatus {
                 return yeeCertStatus;
             }
         }
-        return null;
+        return UN_SIGNED;
 
     }
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/SysUserSignCertService.java

@@ -2,6 +2,7 @@ package com.qunzhixinxi.hnqz.admin.service.gig;
 
 import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
 import com.qunzhixinxi.hnqz.admin.entity.dto.UserSignCertDTO;
+import com.qunzhixinxi.hnqz.admin.entity.vo.SysUserSubVO;
 
 import java.util.List;
 
@@ -21,6 +22,14 @@ public interface SysUserSignCertService {
 	 */
 	List<SysUserSub> listUserSignCert(Integer userId);
 
+	/**
+	 * 查询用户签约认证信息
+	 *
+	 * @param userId
+	 * @return
+	 */
+	List<SysUserSubVO> listUserSignCertForApi(Integer userId);
+
 	/**
 	 * 保存用户基础信息
 	 *

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/impl/SysUserSignCertServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.service.gig.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -16,11 +17,13 @@ import com.qunzhixinxi.hnqz.admin.entity.dto.UserSignCertDTO;
 import com.qunzhixinxi.hnqz.admin.entity.model.GigBaseInfoModel;
 import com.qunzhixinxi.hnqz.admin.entity.model.GigInfoModel;
 import com.qunzhixinxi.hnqz.admin.entity.model.GigUserInfoModel;
+import com.qunzhixinxi.hnqz.admin.entity.vo.SysUserSubVO;
 import com.qunzhixinxi.hnqz.admin.enums.GigChannelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.MemberIDCardType;
 import com.qunzhixinxi.hnqz.admin.enums.MemberType;
 import com.qunzhixinxi.hnqz.admin.enums.PayChannel;
+import com.qunzhixinxi.hnqz.admin.enums.RenlijiaCertStatus;
 import com.qunzhixinxi.hnqz.admin.enums.YeeCertStatus;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
@@ -37,6 +40,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -75,6 +79,43 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		return userSubList;
 	}
 
+	/**
+	 * 查询用户签约认证信息
+	 *
+	 * @param userId
+	 * @return
+	 */
+	@Override
+	public List<SysUserSubVO> listUserSignCertForApi(Integer userId) {
+		List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
+				.eq(SysUserSub::getUserId, userId));
+		if (CollUtil.isNotEmpty(userSubList)) {
+			List<SysUserSubVO> resultList = new ArrayList<>();
+			userSubList.forEach(sysUserSub -> {
+				SysUserSubVO userSubVO = BeanUtil.copyProperties(sysUserSub, SysUserSubVO.class, "certStatus");
+				switch (sysUserSub.getGigType()) {
+					case REN_LI_JIA:
+						userSubVO.setCertStatus(RenlijiaCertStatus.resolve(sysUserSub.getCertStatus()).name());
+						break;
+					case TAX_HELPOR:
+						userSubVO.setCertStatus(TaxHelperCertStatus.resolve(sysUserSub.getCertStatus()).name());
+						break;
+					case YEE:
+						userSubVO.setCertStatus(YeeCertStatus.resolve(String.valueOf(sysUserSub.getCertStatus())).name());
+						break;
+					case OLADING:
+						userSubVO.setCertStatus(YeeCertStatus.resolve(String.valueOf(sysUserSub.getCertStatus())).name());
+						break;
+					default:
+				}
+
+				resultList.add(userSubVO);
+			});
+			return resultList;
+		}
+		return new ArrayList<>();
+	}
+
 	/**
 	 * 保存用户基础信息
 	 *