feat: 用户列表认证状态

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

@@ -17,7 +17,7 @@ public enum TaxHelperCertStatus {
 
 	UN_CERT(10, "未认证"),                    // 未增员
 	ADD_MEMBER(11, "已增员"),                 // 未认证未绑卡
-	CHECKED_UNBIND(12, "已认证，未绑卡"),      // 已认证未绑卡
+	CHECKED_UNBIND(12, "已认证未绑卡"),      // 已认证未绑卡
 	CHECKING_BIND(13, "认证中已绑卡"),         // 认证中已绑卡
 	CHECKING_UNBIND(14, "认证中未绑卡"),       // 认证中未绑卡
 	CERT(15, "已认证"),                    	 // 已认证已绑卡

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

@@ -253,6 +253,6 @@ public class UserVO implements Serializable {
 	/**
 	 * 不同渠道的认证状态
 	 */
-	private Map<String, String> certStatusMap;
+	private String[] certStatusArr;
 
 }

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

@@ -20,6 +20,7 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.bean.BeanUtil;
@@ -45,6 +46,7 @@ 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;
+import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.RenlijiaCertStatus;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.YeeCertStatus;
@@ -1464,9 +1466,10 @@ public class SysUserController {
 		userVosPage.getRecords().forEach(userVO -> {
 			List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
 					.eq(SysUserSub::getUserId, userVO.getUserId()));
+			Map<GigTypeEnum, String> certStatusMap = null;
 			if (CollUtil.isNotEmpty(userSubList)) {
-				Map<String, String> certStatusMap = userSubList.stream()
-						.collect(Collectors.toMap(sysUserSub -> sysUserSub.getGigType().getDesc(),
+				certStatusMap = userSubList.stream()
+						.collect(Collectors.toMap(sysUserSub -> sysUserSub.getGigType(),
 								sysUserSub -> {
 									String certStatuName = "";
 									switch (sysUserSub.getGigType()) {
@@ -1483,12 +1486,23 @@ public class SysUserController {
 											certStatuName = YeeCertStatus.resolve(String.valueOf(sysUserSub.getCertStatus())).getMessage();
 											break;
 										default:
-											certStatuName = String.valueOf(sysUserSub.getCertStatus());
+											certStatuName = "未认证";
 									}
 									return certStatuName;
 								}));
-				userVO.setCertStatusMap(certStatusMap);
+			} else {
+				certStatusMap = new HashMap<>();
 			}
+			List<String> certStatusNameList = new ArrayList<>();
+			certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(GigTypeEnum.REN_LI_JIA)) ?
+					"未认证" : certStatusMap.get(GigTypeEnum.REN_LI_JIA));
+			certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(GigTypeEnum.TAX_HELPOR)) ?
+					"未认证" : certStatusMap.get(GigTypeEnum.TAX_HELPOR));
+			certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(GigTypeEnum.YEE)) ?
+					"未认证" : certStatusMap.get(GigTypeEnum.YEE));
+			certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(GigTypeEnum.OLADING)) ?
+					"未认证" : certStatusMap.get(GigTypeEnum.OLADING));
+			userVO.setCertStatusArr(certStatusNameList.toArray(new String[0]));
 		});
 
 		return R.ok(userVosPage);