feat: 结算相关认证枚举修改

db/v2.0/220720.sql

@@ -33,3 +33,7 @@ alter table sys_dept_sub
 alter table sys_user_sub
     add subject_location varchar(20) null comment '税源地' after gig_channel;
 
+-- 新增字段
+alter table wm_score_package_settle_note
+    add subject_location varchar(20) null comment '税源地';
+

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

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.qunzhixinxi.hnqz.admin.enums.CategoryEnum;
+import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -165,6 +166,11 @@ public class WmScorePackageSettleNote extends Model<WmScorePackageSettleNote> {
 	 */
 	private String subType;
 
+	/**
+	 * 税源地
+	 */
+	private SubjectLocation subjectLocation;
+
 	/**
 	 * 真实名称
 	 */

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

@@ -2,6 +2,7 @@ package com.qunzhixinxi.hnqz.admin.entity.input;
 
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageSettleNote;
 import com.qunzhixinxi.hnqz.admin.enums.CategoryEnum;
+import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 import com.qunzhixinxi.hnqz.common.ding.enums.DingEnum;
 import lombok.Data;
 
@@ -80,6 +81,11 @@ public class WmScorePackageSettleInput {
 
 	private String subType;
 
+	/**
+	 * 税源地
+	 */
+	private SubjectLocation subjectLocation;
+
 	/**
 	 * @Modify: start
 	 * @Version: 2021.4.16

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

@@ -17,6 +17,7 @@ import com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleInput;
 import com.qunzhixinxi.hnqz.admin.entity.output.SettleAmountMonitorOutput;
 import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
 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.mapper.SysUserMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.SysUserSubMapper;
@@ -304,8 +305,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 
 			switch (gigTypeEnum) {
 				case REN_LI_JIA:
-				case JIN_YUAN:
-				case XIN_TAI_ZI:
 				case OLADING:
 					if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 						return R.failed(user.getRealname() + "未认证，不能发起结算");
@@ -461,8 +460,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 
 			switch (gigTypeEnum) {
 				case REN_LI_JIA:
-				case JIN_YUAN:
-				case XIN_TAI_ZI:
 				case OLADING:
 					if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 						return R.failed(user.getRealname() + "未认证，不能发起结算");
@@ -802,16 +799,14 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				params.put("acceptanceStandard", "完成不同任务获得不同任务积分，根据不同任务给与0~30000积分，每个积分兑换0.8~1.2元，按次数结算");
 
 
-				GigTypeEnum gigTypeEnum = GigTypeEnum.resolve(Integer.parseInt(note.getSubType()));
-
-				if (GigTypeEnum.JIN_YUAN.equals(gigTypeEnum)) {
+				if (SubjectLocation.JIN_YUAN.equals(input.getSubjectLocation())) {
 					params.put("channel", "JIN_YUAN");
 					params.put("taxMode", "GENERAL");
 					params.put("transactionModel", "SUPERVISE");
 				}
 				// 海南飞亿 和 河南薪泰梓
 				else {
-					params.put("channel", GigTypeEnum.OLADING.equals(gigTypeEnum) ? "DEFAULT" : "XIN_TAI_ZI");
+					params.put("channel", SubjectLocation.FEI_YI.equals(input.getSubjectLocation()) ? "DEFAULT" : "XIN_TAI_ZI");
 					params.put("taxMode", "SPECIAL");
 					params.put("transactionModel", "CHANNEL");
 				}

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

@@ -37,6 +37,7 @@ import com.qunzhixinxi.hnqz.admin.entity.output.SettleAmountMonitorOutput;
 import com.qunzhixinxi.hnqz.admin.entity.output.WmTaskSettleNoteOutput;
 import com.qunzhixinxi.hnqz.admin.enums.ChannelEnum;
 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.mapper.SysUserSubMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageMapper;
@@ -523,8 +524,6 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 		switch (gigTypeEnum) {
 			case REN_LI_JIA:
-			case JIN_YUAN:
-			case XIN_TAI_ZI:
 			case OLADING:
 				if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 					return R.failed(sysUser.getRealname() + "未认证，不能发起结算");
@@ -641,8 +640,6 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 			switch (gigTypeEnum) {
 				case REN_LI_JIA:
-				case XIN_TAI_ZI:
-				case JIN_YUAN:
 				case OLADING:
 					if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 						return R.failed(sysUser.getRealname() + "未认证，不能发起结算");
@@ -801,16 +798,14 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
 				params.put("acceptanceStandard", "完成不同任务获得不同任务积分，根据不同任务给与0~30000积分，每个积分兑换0.8~1.2元，按次数结算");
 
-				GigTypeEnum gigTypeEnum = GigTypeEnum.resolve(Integer.parseInt(note.getSubType()));
-
-				if (GigTypeEnum.JIN_YUAN.equals(gigTypeEnum)) {
+				if (SubjectLocation.JIN_YUAN.equals(note.getSubjectLocation())) {
 					params.put("channel", "JIN_YUAN");
 					params.put("taxMode", "GENERAL");
 					params.put("transactionModel", "SUPERVISE");
 				}
 				// 海南飞亿 和 河南薪泰梓
 				else {
-					params.put("channel", GigTypeEnum.OLADING.equals(gigTypeEnum) ? "DEFAULT" : "XIN_TAI_ZI");
+					params.put("channel", SubjectLocation.FEI_YI.equals(note.getSubjectLocation()) ? "DEFAULT" : "XIN_TAI_ZI");
 					params.put("taxMode", "SPECIAL");
 					params.put("transactionModel", "CHANNEL");
 				}
@@ -1070,16 +1065,14 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			params.put("acceptanceStandard", "完成不同任务获得不同任务积分，根据不同任务给与0~30000积分，每个积分兑换0.8~1.2元，按次数结算");
 
 
-			GigTypeEnum gigTypeEnum = GigTypeEnum.resolve(Integer.parseInt(note.getSubType()));
-
-			if (GigTypeEnum.JIN_YUAN.equals(gigTypeEnum)) {
+			if (SubjectLocation.JIN_YUAN.equals(note.getSubjectLocation())) {
 				params.put("channel", "JIN_YUAN");
 				params.put("taxMode", "GENERAL");
 				params.put("transactionModel", "SUPERVISE");
 			}
 			// 海南飞亿 和 河南薪泰梓
 			else {
-				params.put("channel", GigTypeEnum.OLADING.equals(gigTypeEnum) ? "DEFAULT" : "XIN_TAI_ZI");
+				params.put("channel", SubjectLocation.FEI_YI.equals(note.getSubjectLocation()) ? "DEFAULT" : "XIN_TAI_ZI");
 				params.put("taxMode", "SPECIAL");
 				params.put("transactionModel", "CHANNEL");
 			}