fix: 易联-金园数科

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

@@ -17,7 +17,8 @@ public enum GigChannelEnum {
 	// 渠道
 	DEFAULT(0, "默认渠道"),
 	CICC(1, "中金"),
-	PINGAN(2, "平安银行");
+	PINGAN(2, "平安银行"),
+	JIN_YUAN(31, "金园数科");
 
 	@EnumValue
 	private int code;

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

@@ -1,40 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 易联零工渠道
- *
- * @author lixuesong
- * @date 2022年03月03日 14:06
- */
-@Getter
-@AllArgsConstructor
-public enum GigYeeChannelEnum {
-
-	// 渠道
-	DEFAULT(0, "默认渠道"),
-	JIN_YUAN(1, "金园数科");
-
-	@EnumValue
-	private int code;
-
-	private String desc;
-
-	/**
-	 * 根据枚举编码获取枚举对象
-	 *
-	 * @param code
-	 * @return
-	 */
-	public static GigYeeChannelEnum resolve(int code){
-		for (GigYeeChannelEnum channelEnum: GigYeeChannelEnum.values()){
-			if (channelEnum.code == code){
-				return channelEnum;
-			}
-		}
-		return DEFAULT;
-	}
-}

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

@@ -24,7 +24,6 @@ import com.qunzhixinxi.hnqz.admin.entity.vo.SysUserSubVO;
 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.GigYeeChannelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.LockEnum;
 import com.qunzhixinxi.hnqz.admin.enums.MemberIDCardType;
 import com.qunzhixinxi.hnqz.admin.enums.MemberType;
@@ -178,7 +177,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		userSignCertDTO.getGigTypeList().forEach(gigType -> {
 			// 税邦云单独设置渠道类型
 			GigChannelEnum gigChannel;
-			if (GigTypeEnum.TAX_HELPOR.equals(gigType) || GigTypeEnum.YEE.equals(gigType)) {
+			if (GigTypeEnum.TAX_HELPOR.equals(gigType)) {
 				// 读取用户所认证的企业的结算渠道
 				SysDeptSub deptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
 						.eq(SysDeptSub::getDeptId, queryUser.getDeptId())
@@ -189,6 +188,17 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 				} else {
 					gigChannel = GigChannelEnum.DEFAULT;
 				}
+			} else if (GigTypeEnum.YEE.equals(gigType)) {
+				// 读取用户所认证的企业的结算渠道
+				SysDeptSub deptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
+						.eq(SysDeptSub::getDeptId, queryUser.getDeptId())
+						.eq(SysDeptSub::getSubjectType, GigTypeEnum.TAX_HELPOR.getCode())
+						.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode()));
+				if (deptSub != null && "1".equals(deptSub.getSubjectType())) {
+					gigChannel = GigChannelEnum.JIN_YUAN;
+				} else {
+					gigChannel = GigChannelEnum.DEFAULT;
+				}
 			} else {
 				gigChannel = GigChannelEnum.DEFAULT;
 			}
@@ -300,12 +310,12 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 						&& TaxHelperCertStatus.CERT.getCode() != sysUserSub.getCertStatus()) {
 					return true;
 				} else if (GigTypeEnum.YEE.equals(sysUserSub.getGigType())
-						&& GigYeeChannelEnum.JIN_YUAN.equals(sysUserSub.getGigChannel())
+						&& GigChannelEnum.JIN_YUAN.equals(sysUserSub.getGigChannel())
 						&& !OladingCertStatus.CERT.getCode().equals(String.valueOf(sysUserSub.getCertStatus()))) {
 					// 易联并且渠道是金园数科（自由职家）
 					return true;
 				} else if (GigTypeEnum.YEE.equals(sysUserSub.getGigType())
-						&& GigYeeChannelEnum.DEFAULT.equals(sysUserSub.getGigChannel())
+						&& GigChannelEnum.DEFAULT.equals(sysUserSub.getGigChannel())
 						&& !YeeCertStatus.SIGNED.getCode().equals(String.valueOf(sysUserSub.getCertStatus()))) {
 					// 易联并且渠道是默认
 					return true;