refactor: 解决冲突

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

@@ -19,7 +19,6 @@ public enum SubjectTypeEnum {
 	TYPE_HUI_QI_YUN("6", "汇企云"),
 	TYPE_ZHONG_YI_YUN("7", "众蚁云"),
 	TYPE_ZHONG_ZHI("8", "中智"),
-	TYPE_HAN_TANG("9", "汉唐"),
 
 	ENABLE_FLAG_FALSE("0", "无效"),
 	ENABLE_FLAG_TRUE("1", "有效"),

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

@@ -440,13 +440,6 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 
 				this.updateUserCertStatus(userSub.getId(), "内部状态对其", ZhongZhiCertStatus.SIGN.getCode(), null);
 				return R.ok();
-			case HAN_TANG:
-				// 汉唐
-				if (userSub.getCertStatus() > HanTangCertStatus.UN_SIGN.getCode()) {
-					return R.ok();
-				}
-				this.updateUserCertStatus(userSub.getId(), "内部状态对其", HanTangCertStatus.SIGN.getCode(), null);
-				return R.ok();
 			default:
 				message = "不支持该税源地操作";
 		}
@@ -635,8 +628,6 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 					return true;
 				} else if (GigTypeEnum.ZHONG_ZHI.equals(sysUserSub.getGigType())) {
 					return true;
-				} else if (GigTypeEnum.HAN_TANG.equals(sysUserSub.getGigType())) {
-					return true;
 				}
 				return false;
 			}).forEach(userSub -> {

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

@@ -217,7 +217,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				case HUI_QI_YUN:
 				case ZHONG_YI_YUN:
 				case ZHONG_ZHI:
-				case HAN_TANG:
 					if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 						throw new RuntimeException(user.getRealname() + "未认证，不能发起结算");
 					}

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

@@ -617,7 +617,6 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			case HUI_QI_YUN:
 			case ZHONG_YI_YUN:
 			case ZHONG_ZHI:
-			case HAN_TANG:
 				if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 					return R.failed(sysUser.getRealname() + "未认证，不能发起结算");
 				}
@@ -767,7 +766,6 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				case HUI_QI_YUN:
 				case ZHONG_YI_YUN:
 				case ZHONG_ZHI:
-				case HAN_TANG:
 					if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 						return R.failed(sysUser.getRealname() + "未认证，不能发起结算");
 					}