feat: 认证相关

db/v2.0/220720.sql

@@ -15,6 +15,7 @@ create table sys_user_ext_record
     id_card_back_base64  longtext         null comment '身份证照片-反面base64',
     best_frame_url       varchar(255)     null comment '最佳帧照片url',
     best_frame_base64    longtext         null comment '最佳帧照片base64',
+    etoken               varchar(40)      null comment 'etoken',
     remark               varchar(255)     null comment '备注',
     del_flag             char default '0' null comment '删除标记',
     create_time          datetime         null comment '创建时间',

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

@@ -31,6 +31,7 @@ import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
 import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
 import com.qunzhixinxi.hnqz.admin.entity.SysCertResultRecord;
 import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
+import com.qunzhixinxi.hnqz.admin.entity.SysUserExtRecord;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaAgent;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaDistribution;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaDrugEnt;
@@ -58,6 +59,7 @@ 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.SubjectLocation;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.UserSignResultEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.SysCertResultRecordMapper;
@@ -66,6 +68,7 @@ import com.qunzhixinxi.hnqz.admin.service.SysDeptSubService;
 import com.qunzhixinxi.hnqz.admin.service.SysDictItemService;
 import com.qunzhixinxi.hnqz.admin.service.SysFileService;
 import com.qunzhixinxi.hnqz.admin.service.SysPublicParamService;
+import com.qunzhixinxi.hnqz.admin.service.SysUserExtRecordService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.admin.service.WmAdRecordService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaAgentService;
@@ -209,6 +212,7 @@ public class ApiController {
 	private final WmUserSignDetailService wmUserSignDetailService;
 	private final WmAdRecordService adRecordService;
 	private final SysUserSignCertService sysUserSignCertService;
+	private final SysUserExtRecordService sysUserExtRecordService;
 
 	@SysLog("通过任务类型获取表单配置")
 	@ApiOperation(value = "任务类型表单配置-通过任务类型获取表单配置", notes = "根据任务类型获取表单配置")
@@ -743,9 +747,17 @@ public class ApiController {
 //				}
 				List<String> subTypeList = subList.stream()
 						.map(SysDeptSub::getSubjectType)
+						.distinct()
 						.collect(Collectors.toList());
 				mapOne.put("subList", subTypeList);
 
+				// 税源地
+				List<SubjectLocation> subjectLocationList = subList.stream()
+						.map(SysDeptSub::getSubjectLocation)
+						.sorted(Comparator.comparing(SubjectLocation::getSort))
+						.collect(Collectors.toList());
+				mapOne.put("subjectLocationList", subjectLocationList);
+
 				// 查询配置了任务类型模板的任务类型
 				mapOne.put("hasTaskTypeTemplate", wmDeptTaskTypeTemplateService.listTaskTypeByDeptId(sysU.getDeptId()));
 
@@ -761,6 +773,9 @@ public class ApiController {
 				List<SysUserSubVO> userSignCertList = sysUserSignCertService.listUserSignCertForApi(sysU.getUserId());
 				mapOne.put("certList", userSignCertList);
 
+				// 查询是否已认证过E证通
+				mapOne.put("existEidResult", sysUserExtRecordService.existUserExtRecord());
+
 				// 获取发起认证的令牌
 				String randomStr;
 
@@ -4003,6 +4018,26 @@ public class ApiController {
 
 		cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(tokenResult.getBody());
 
+		if (CommonConstants.SUCCESS.equals(jsonObject.getInt("code"))) {
+			cn.hutool.json.JSONObject data = jsonObject.getJSONObject("data");
+			if (data != null) {
+				if (CommonConstants.SUCCESS.equals(data.getInt("compareCode"))) {
+					// 认证成功，则保存
+					SysUserExtRecord userExtRecord = new SysUserExtRecord();
+					userExtRecord.setRealName(data.getStr("realName"));
+					userExtRecord.setIdCardNumber(data.getStr("idCard"));
+					userExtRecord.setBestFrameBase64(data.getStr("bestFrameBase64"));
+					userExtRecord.setBestFrameUrl(data.getStr("bestFrameUrl"));
+					userExtRecord.setIdCardFrontBase64(data.getStr("idCardFrontBase64"));
+					userExtRecord.setIdCardBackBase64(data.getStr("idCardBackBase64"));
+					userExtRecord.setIdCardFrontUrl(data.getStr("idCardFrontUrl"));
+					userExtRecord.setIdCardBackUrl(data.getStr("idCardBackUrl"));
+					userExtRecord.setEtoken(data.getStr("etoken"));
+					sysUserExtRecordService.saveUserExtRecord(userExtRecord);
+				}
+			}
+		}
+
 		return R.builder().code(jsonObject.getInt("code")).msg(jsonObject.getStr("msg")).data(jsonObject.getObj("data")).build();
 
 

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

@@ -1452,9 +1452,10 @@ public class SysUserController {
 		Set<Integer> deptIds = userVosPage.getRecords().stream().map(UserVO::getDeptId).collect(Collectors.toSet());
 
 		if (CollUtil.isNotEmpty(deptIds)) {
-			Map<Integer, Map<String, Integer>> coll = sysDeptSubService.list(Wrappers.<SysDeptSub>lambdaQuery().in(SysDeptSub::getDeptId, deptIds))
-					.stream()
-					.collect(Collectors.groupingBy(SysDeptSub::getDeptId, Collectors.toMap(SysDeptSub::getSubjectType, SysDeptSub::getSubjectChannel)));
+			// TODO
+//			Map<Integer, Map<String, Integer>> coll = sysDeptSubService.list(Wrappers.<SysDeptSub>lambdaQuery().in(SysDeptSub::getDeptId, deptIds))
+//					.stream()
+//					.collect(Collectors.groupingBy(SysDeptSub::getDeptId, Collectors.toMap(SysDeptSub::getSubjectType, SysDeptSub::getSubjectChannel)));
 
 			userVosPage.getRecords().forEach(item -> {
 				if ("0".equals(userDTO.getSubType())) {
@@ -1463,7 +1464,7 @@ public class SysUserController {
 					item.setRljCertStatus(null);
 				}
 
-				item.setSubjectTypeAndChannel(coll.get(item.getDeptId()));
+//				item.setSubjectTypeAndChannel(coll.get(item.getDeptId()));
 
 			});
 		}
@@ -1504,54 +1505,54 @@ public class SysUserController {
 					});
 					userVO.setCertList(certList);
 
-					// 不同渠道认证名称，封装成中文名称数组格式
-					Map<SubjectLocation, String> certStatusMap = userSubList.stream()
-							.collect(Collectors.toMap(SysUserSub::getSubjectLocation,
-									sysUserSub -> {
-										String certStatuName = "";
-										switch (sysUserSub.getGigType()) {
-											case TAX_HELPOR:
-												certStatuName = TaxHelperCertStatus.resolve(sysUserSub.getCertStatus()).getDesc();
-												break;
-											case YEE:
-												certStatuName = YeeCertStatus.resolve(String.valueOf(sysUserSub.getCertStatus())).getMessage();
-												break;
-											case REN_LI_JIA:
-												certStatuName = RenlijiaCertStatus.resolve(sysUserSub.getCertStatus()).getMessage();
-												break;
-											case OLADING:
-												certStatuName = OladingCertStatus.resolve(String.valueOf(sysUserSub.getCertStatus())).getMessage();
-												break;
-											default:
-												certStatuName = "";
-										}
-										return certStatuName;
-									}));
-					// 该企业配置的所有税源地
-					List<SubjectLocation> subjectLocationList = subList.stream().map(SysDeptSub::getSubjectLocation).collect(Collectors.toList());
-
-					List<String> certStatusNameList = new ArrayList<>();
-					if (subjectLocationList.contains(SubjectLocation.REN_LI_JIA)) {
-						certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(SubjectLocation.REN_LI_JIA)) ?
-								RenlijiaCertStatus.CER_STATUS_4.getMessage() : certStatusMap.get(SubjectLocation.REN_LI_JIA));
-					}
-					if (subjectLocationList.contains(SubjectLocation.LUO_SHU_YUN)) {
-						certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(SubjectLocation.LUO_SHU_YUN)) ?
-								TaxHelperCertStatus.UN_CERT.getDesc() : certStatusMap.get(SubjectLocation.LUO_SHU_YUN));
-					}
-					if (subjectLocationList.contains(SubjectLocation.FEI_YI)) {
-						certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(SubjectLocation.FEI_YI)) ?
-								OladingCertStatus.UN_SIGNED.getMessage() : certStatusMap.get(SubjectLocation.FEI_YI));
-					}
-					if (subjectLocationList.contains(SubjectLocation.JIN_YUAN)) {
-						certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(SubjectLocation.JIN_YUAN)) ?
-								OladingCertStatus.UN_SIGNED.getMessage() : certStatusMap.get(SubjectLocation.JIN_YUAN));
-					}
-					if (subjectLocationList.contains(SubjectLocation.XIN_TAI_ZI)) {
-						certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(SubjectLocation.XIN_TAI_ZI)) ?
-								OladingCertStatus.UN_SIGNED.getMessage() : certStatusMap.get(SubjectLocation.XIN_TAI_ZI));
-					}
-					userVO.setCertStatusArr(certStatusNameList.toArray(new String[0]));
+					// 不同渠道认证名称，封装成中文名称数组格式 TODO
+//					Map<SubjectLocation, String> certStatusMap = userSubList.stream()
+//							.collect(Collectors.toMap(SysUserSub::getSubjectLocation,
+//									sysUserSub -> {
+//										String certStatuName = "";
+//										switch (sysUserSub.getGigType()) {
+//											case TAX_HELPOR:
+//												certStatuName = TaxHelperCertStatus.resolve(sysUserSub.getCertStatus()).getDesc();
+//												break;
+//											case YEE:
+//												certStatuName = YeeCertStatus.resolve(String.valueOf(sysUserSub.getCertStatus())).getMessage();
+//												break;
+//											case REN_LI_JIA:
+//												certStatuName = RenlijiaCertStatus.resolve(sysUserSub.getCertStatus()).getMessage();
+//												break;
+//											case OLADING:
+//												certStatuName = OladingCertStatus.resolve(String.valueOf(sysUserSub.getCertStatus())).getMessage();
+//												break;
+//											default:
+//												certStatuName = "";
+//										}
+//										return certStatuName;
+//									}));
+//					// 该企业配置的所有税源地
+//					List<SubjectLocation> subjectLocationList = subList.stream().map(SysDeptSub::getSubjectLocation).collect(Collectors.toList());
+//
+//					List<String> certStatusNameList = new ArrayList<>();
+//					if (subjectLocationList.contains(SubjectLocation.REN_LI_JIA)) {
+//						certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(SubjectLocation.REN_LI_JIA)) ?
+//								RenlijiaCertStatus.CER_STATUS_4.getMessage() : certStatusMap.get(SubjectLocation.REN_LI_JIA));
+//					}
+//					if (subjectLocationList.contains(SubjectLocation.LUO_SHU_YUN)) {
+//						certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(SubjectLocation.LUO_SHU_YUN)) ?
+//								TaxHelperCertStatus.UN_CERT.getDesc() : certStatusMap.get(SubjectLocation.LUO_SHU_YUN));
+//					}
+//					if (subjectLocationList.contains(SubjectLocation.FEI_YI)) {
+//						certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(SubjectLocation.FEI_YI)) ?
+//								OladingCertStatus.UN_SIGNED.getMessage() : certStatusMap.get(SubjectLocation.FEI_YI));
+//					}
+//					if (subjectLocationList.contains(SubjectLocation.JIN_YUAN)) {
+//						certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(SubjectLocation.JIN_YUAN)) ?
+//								OladingCertStatus.UN_SIGNED.getMessage() : certStatusMap.get(SubjectLocation.JIN_YUAN));
+//					}
+//					if (subjectLocationList.contains(SubjectLocation.XIN_TAI_ZI)) {
+//						certStatusNameList.add(StrUtil.isBlank(certStatusMap.get(SubjectLocation.XIN_TAI_ZI)) ?
+//								OladingCertStatus.UN_SIGNED.getMessage() : certStatusMap.get(SubjectLocation.XIN_TAI_ZI));
+//					}
+//					userVO.setCertStatusArr(certStatusNameList.toArray(new String[0]));
 				}
 			}
 

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

@@ -5,13 +5,16 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserExtRecord;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
 import com.qunzhixinxi.hnqz.admin.entity.dto.UserSignCertDTO;
+import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
+import com.qunzhixinxi.hnqz.admin.service.SysUserExtRecordService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.admin.service.gig.SysUserSignCertService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
@@ -48,6 +51,8 @@ import java.util.stream.Collectors;
 @RequestMapping("/user-sign-cert")
 public class SysUserSignCertController {
 
+	private final SysUserExtRecordService sysUserExtRecordService;
+
 	private final SysUserSignCertService sysUserSignCertService;
 
 	private final SysUserService sysUserService;
@@ -129,10 +134,10 @@ public class SysUserSignCertController {
 	 * @param userExtRecord
 	 * @return
 	 */
-	@PostMapping("/eid/result")
-	public R<?> saveEidResult(@RequestBody SysUserExtRecord userExtRecord) {
+	@PostMapping("/ext/record")
+	public R<?> saveUserExtRecord(@RequestBody SysUserExtRecord userExtRecord) {
 
-		sysUserSignCertService.saveEidResult(userExtRecord);
+		sysUserExtRecordService.saveUserExtRecord(userExtRecord);
 
 		return R.ok();
 	}

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

@@ -91,6 +91,11 @@ public class SysUserExtRecord extends Model<SysUserExtRecord> {
      */
     private String bestFrameBase64;
 
+	/**
+	 * etoken
+	 */
+	private String etoken;
+
     /**
      * 备注
      */

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

@@ -3,6 +3,7 @@ package com.qunzhixinxi.hnqz.admin.entity.vo;
 import com.qunzhixinxi.hnqz.admin.enums.GigCallBackStatus;
 import com.qunzhixinxi.hnqz.admin.enums.GigChannelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
+import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -41,6 +42,11 @@ public class SysUserSubVO {
 	 */
 	private GigChannelEnum gigChannel;
 
+	/**
+	 * 税源地
+	 */
+	private SubjectLocation subjectLocation;
+
 	/**
 	 * 回调状态
 	 */

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

@@ -1,11 +1,28 @@
 package com.qunzhixinxi.hnqz.admin.service;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserExtRecord;
+import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
+import com.qunzhixinxi.hnqz.common.core.util.R;
+import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 
 /**
 * 用户认证相关的扩展信息服务
 */
 public interface SysUserExtRecordService extends IService<SysUserExtRecord> {
 
+	/**
+	 * 保存E证通认证结果
+	 *
+	 * @param userExtRecord
+	 */
+	void saveUserExtRecord(SysUserExtRecord userExtRecord);
+
+	/**
+	 * 查询E证通是否认证过
+	 *
+	 * @return
+	 */
+	boolean existUserExtRecord();
 }

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

@@ -1,6 +1,5 @@
 package com.qunzhixinxi.hnqz.admin.service.gig;
 
-import com.qunzhixinxi.hnqz.admin.entity.SysUserExtRecord;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
 import com.qunzhixinxi.hnqz.admin.entity.dto.UserSignCertDTO;
 import com.qunzhixinxi.hnqz.admin.entity.vo.SysUserSubVO;
@@ -61,13 +60,6 @@ public interface SysUserSignCertService {
 	 */
 	void saveBaseInfo(UserSignCertDTO userSignCertDTO);
 
-	/**
-	 * 保存E证通认证结果
-	 *
-	 * @param userExtRecord
-	 */
-	void saveEidResult(SysUserExtRecord userExtRecord);
-
 	/**
 	 * 签协议
 	 *

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

@@ -268,30 +268,6 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		});
 	}
 
-	/**
-	 * 保存E证通认证结果
-	 *
-	 * @param userExtRecord
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public void saveEidResult(SysUserExtRecord userExtRecord) {
-		HnqzUser hnqzUser = SecurityUtils.getUser();
-
-		// 作废已有数据
-		sysUserExtRecordService.update(Wrappers.<SysUserExtRecord>lambdaUpdate()
-				.eq(SysUserExtRecord::getUserId, hnqzUser.getId())
-				.eq(SysUserExtRecord::getDelFlag, DelEnum.NOT_DEL.val())
-				.set(SysUserExtRecord::getDelFlag, DelEnum.DELETED.val()));
-		// 新增一条数据
-		SysUserExtRecord insertExtRecord = BeanUtil.copyProperties(userExtRecord, SysUserExtRecord.class);
-		insertExtRecord.setUserId(hnqzUser.getId());
-		insertExtRecord.setDeptId(hnqzUser.getDeptId());
-		insertExtRecord.setCreateTime(LocalDateTime.now());
-		insertExtRecord.setCreateUser(hnqzUser.getId());
-		sysUserExtRecordService.save(insertExtRecord);
-	}
-
 	/**
 	 * 签约/增员
 	 *

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

@@ -1,10 +1,19 @@
 package com.qunzhixinxi.hnqz.admin.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserExtRecord;
+import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.SysUserExtRecordMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysUserExtRecordService;
+import com.qunzhixinxi.hnqz.common.core.util.R;
+import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
+import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
 
 /**
  * 用户认证相关的扩展信息服务
@@ -13,4 +22,43 @@ import org.springframework.stereotype.Service;
 public class SysUserExtRecordServiceImpl extends ServiceImpl<SysUserExtRecordMapper, SysUserExtRecord>
 		implements SysUserExtRecordService {
 
+	/**
+	 * 保存E证通认证结果
+	 *
+	 * @param userExtRecord
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void saveUserExtRecord(SysUserExtRecord userExtRecord) {
+		HnqzUser hnqzUser = SecurityUtils.getUser();
+
+		// 作废已有数据
+		this.update(Wrappers.<SysUserExtRecord>lambdaUpdate()
+				.eq(SysUserExtRecord::getUserId, hnqzUser.getId())
+				.eq(SysUserExtRecord::getDelFlag, DelEnum.NOT_DEL.val())
+				.set(SysUserExtRecord::getDelFlag, DelEnum.DELETED.val()));
+		// 新增一条数据
+		SysUserExtRecord insertExtRecord = BeanUtil.copyProperties(userExtRecord, SysUserExtRecord.class);
+		insertExtRecord.setUserId(hnqzUser.getId());
+		insertExtRecord.setDeptId(hnqzUser.getDeptId());
+		insertExtRecord.setCreateTime(LocalDateTime.now());
+		insertExtRecord.setCreateUser(hnqzUser.getId());
+		this.save(insertExtRecord);
+	}
+
+	/**
+	 * 查询E证通是否认证过
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean existUserExtRecord() {
+		Integer userId = SecurityUtils.getUser().getId();
+		int count = this.count(Wrappers.<SysUserExtRecord>lambdaQuery()
+				.eq(SysUserExtRecord::getUserId, userId)
+				.eq(SysUserExtRecord::getDelFlag, DelEnum.NOT_DEL.val()));
+
+		return count > 0;
+	}
+
 }