Forráskód Böngészése

feat: 发起认证校验是否配置了认证启用

李学松 2 éve
szülő
commit
919fab84b8

+ 1 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptSubController.java

@@ -86,6 +86,7 @@ public class SysDeptSubController {
 	 * @param settleConfigDTO
 	 * @return
 	 */
+	@SysLog("结算管理配置-保存")
 	@PostMapping("/save-settle-config")
 	public R<?> saveSettleConfig(@Valid @RequestBody SettleConfigDTO settleConfigDTO) {
 		for (SettleConfigDTO.DeptSub deptSub : settleConfigDTO.getSubList()) {

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

@@ -8,12 +8,16 @@ 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.SysDeptSub;
 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.enums.SubjectTypeEnum;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptSubService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserExtRecordService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
@@ -59,6 +63,8 @@ public class SysUserSignCertController {
 
 	private final SysUserSubService sysUserSubService;
 
+	private final SysDeptSubService sysDeptSubService;
+
 	private final RedisTemplate<String, Object> redisTemplate;
 
 	/**
@@ -112,6 +118,17 @@ public class SysUserSignCertController {
 			return R.failed("身份证号不正确");
 		}
 
+		// 校验是否配置了结算限制
+		Integer deptId = SecurityUtils.getUser().getDeptId();
+		SysDeptSub queryDeptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
+				.eq(SysDeptSub::getDeptId, SecurityUtils.getUser().getDeptId())
+				.eq(SysDeptSub::getSubjectLocation, userSignCertDTO.getSubjectLocation())
+				.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode()));
+		if (!queryDeptSub.getCertEnable()) {
+			log.info("{}企业配置了认证限制", deptId);
+			return R.failed("系统维护中,请联系管理员");
+		}
+
 		sysUserSignCertService.saveBaseInfo(userSignCertDTO);
 
 		return R.ok();
@@ -132,6 +149,18 @@ public class SysUserSignCertController {
 		if (userSignCertDTO.getSubjectLocation() == null) {
 			return R.failed("税源地不能为空");
 		}
+
+		// 校验是否配置了结算限制
+		Integer deptId = SecurityUtils.getUser().getDeptId();
+		SysDeptSub queryDeptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
+				.eq(SysDeptSub::getDeptId, SecurityUtils.getUser().getDeptId())
+				.eq(SysDeptSub::getSubjectLocation, userSignCertDTO.getSubjectLocation())
+				.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode()));
+		if (!queryDeptSub.getCertEnable()) {
+			log.info("{}企业配置了认证限制", deptId);
+			return R.failed("系统维护中,请联系管理员");
+		}
+
 		return sysUserSignCertService.toSign(userSignCertDTO);
 	}
 
@@ -236,6 +265,17 @@ public class SysUserSignCertController {
 //			}
 		}
 
+		// 校验是否配置了结算限制
+		Integer deptId = SecurityUtils.getUser().getDeptId();
+		SysDeptSub queryDeptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
+				.eq(SysDeptSub::getDeptId, SecurityUtils.getUser().getDeptId())
+				.eq(SysDeptSub::getSubjectLocation, userSignCertDTO.getSubjectLocation())
+				.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode()));
+		if (!queryDeptSub.getCertEnable()) {
+			log.info("{}企业配置了认证限制", deptId);
+			return R.failed("系统维护中,请联系管理员");
+		}
+
 		// 过滤出阿拉钉的渠道
 		Collection<SubjectLocation> oladingList =
 				CollUtil.intersection(CollUtil.toList(userSignCertDTO.getSubjectLocation()), SubjectLocation.getByGigType(GigTypeEnum.OLADING));

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

@@ -73,13 +73,13 @@ public class SettleConfigDTO implements Serializable {
 		private String[] subjectInvoiceCategory;
 
 		/**
-		 * 认证限制:1:限制认证,0:可以认证
+		 * 认证是否启用:1:启用,0:停用
 		 */
-		private Boolean certLimit;
+		private Boolean certEnable;
 
 		/**
-		 * 结算限制:1:限制结算,0:可以结算
+		 * 结算是否启用:1:启用,0:停用
 		 */
-		private Boolean settleLimit;
+		private Boolean settleEnable;
 	}
 }