Merge branch 'feat-20230321-huiqiyun'

db/v2.0/230321.sql

@@ -0,0 +1,2 @@
+alter table sys_dept_sub
+    add eid_enable tinyint default 1 null comment 'E证通认证是否启用：1-启用，0-停用';

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

@@ -825,6 +825,9 @@ public class ApiController {
 					.collect(Collectors.toMap(sysDeptSub -> sysDeptSub.getSubjectLocation().name(), SysDeptSub::getSubjectChannel));
 			mapOne.put("subjectTypeAndChannel", collect);
 
+			// 税源地和eidEnable对应关系
+			Map<SubjectLocation, Boolean> subEidMap = subList.stream().collect(Collectors.toMap(SysDeptSub::getSubjectLocation, SysDeptSub::getEidEnable));
+			mapOne.put("subjectLocationEid", subEidMap);
 
 			// 认证服务信息回显
 			List<SysUserSubVO> userSignCertList = sysUserSignCertService.listUserSignCertForApi(sysU.getUserId(), sysU.getDeptId());

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

@@ -92,4 +92,9 @@ public class SysDeptSub extends Model<SysDeptSub> {
 	 */
 	private Boolean settleEnable;
 
+	/**
+	 * E证通认证是否启用：1-启用，0-停用
+	 */
+	private Boolean eidEnable;
+
 }

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

@@ -81,5 +81,10 @@ public class SettleConfigDTO implements Serializable {
 		 * 结算是否启用：1：启用，0：停用
 		 */
 		private Boolean settleEnable;
+
+		/**
+		 * E证通认证是否启用：1-启用，0-停用
+		 */
+		private Boolean eidEnable;
 	}
 }

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

@@ -531,7 +531,16 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 			if (!SubjectLocation.REN_LI_JIA.equals(userSignCertDTO.getSubjectLocation())
 					&& !SubjectLocation.JIANG_XI.equals(userSignCertDTO.getSubjectLocation())) {
 				// 人力家、正启之星-江西 不校验userExtRecord
-				return false;
+
+				SysDeptSub queryDeptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
+						.eq(SysDeptSub::getDeptId, sysUser.getDeptId())
+						.eq(SysDeptSub::getSubjectLocation, userSignCertDTO.getSubjectLocation())
+						.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode()));
+				// 判断E证通认证是否启用，如果启用了并且userExtRecord为空，则中断发起认证
+				if (queryDeptSub.getEidEnable()) {
+					log.warn("userId={}缺少userExtRecord数据", userId);
+					return false;
+				}
 			}
 		}
 		// 查询dept

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

@@ -170,6 +170,7 @@ public class SysDeptSubServiceImpl extends ServiceImpl<SysDeptSubMapper, SysDept
 				updateDeptSub.setLimitAmount(sysDeptSub.getLimitAmount());
 				updateDeptSub.setCertEnable(sysDeptSub.getCertEnable());
 				updateDeptSub.setSettleEnable(sysDeptSub.getSettleEnable());
+				updateDeptSub.setEidEnable(sysDeptSub.getEidEnable());
 				updateDeptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
 				updateDeptSub.setUpdateTime(LocalDateTime.now());
 				sysDeptSubMapper.updateById(updateDeptSub);
@@ -184,6 +185,7 @@ public class SysDeptSubServiceImpl extends ServiceImpl<SysDeptSubMapper, SysDept
 				insertDeptSub.setLimitAmount(sysDeptSub.getLimitAmount());
 				insertDeptSub.setCertEnable(sysDeptSub.getCertEnable());
 				insertDeptSub.setSettleEnable(sysDeptSub.getSettleEnable());
+				insertDeptSub.setEidEnable(sysDeptSub.getEidEnable());
 				insertDeptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
 				sysDeptSubMapper.insert(insertDeptSub);
 			}