Browse Source

feat: 认证相关枚举

lixuesong 3 years ago
parent
commit
39f723fe8e

+ 4 - 0
db/v2.0/220720.sql

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

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

@@ -55,9 +55,9 @@ public class SysDeptSub extends Model<SysDeptSub> {
 	private Integer subjectChannel;
 
 	/**
-	 * 结算通道
+	 * 税源地
 	 */
-	@ApiModelProperty(value = "结算通道")
+	@ApiModelProperty(value = "税源地")
 	private SubjectLocation subjectLocation;
 
 	@ApiModelProperty(value = "限额")

+ 6 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/SysUserSub.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 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.SubjectLocation;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -50,6 +51,11 @@ public class SysUserSub extends Model<SysUserSub> {
 	 */
 	private GigChannelEnum gigChannel;
 
+	/**
+	 * 税源地
+	 */
+	private SubjectLocation subjectLocation;
+
 	/**
 	 * 回调状态
 	 */

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

@@ -10,7 +10,6 @@ import lombok.Getter;
  * @author lixuesong
  * @date 2022年03月03日 14:06
  */
-@Deprecated
 @Getter
 @AllArgsConstructor
 public enum GigChannelEnum {
@@ -18,9 +17,7 @@ public enum GigChannelEnum {
 	// 渠道
 	DEFAULT(0, "默认渠道"),
 	CICC(1, "中金"),
-	PINGAN(2, "平安银行"),
-	JIN_YUAN(31, "金园数科"),
-	XIN_TAI_ZI(32, "河南薪泰梓");
+	PINGAN(2, "平安银行");
 
 	@EnumValue
 	private int code;

+ 1 - 3
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/GigTypeEnum.java

@@ -18,9 +18,7 @@ public enum GigTypeEnum {
 	REN_LI_JIA(0, "人力家", "人力家"),
 	TAX_HELPOR(1, "税邦云", "税邦云"),
 	OLADING(2, "钉灵工", "钉灵工-海南飞亿"),
-	YEE(3, "易联数科", "易联数科"),
-	JIN_YUAN(4, "钉灵工", "金园数科"),
-	XIN_TAI_ZI(5, "钉灵工", "钉灵工-河南薪泰梓");
+	YEE(3, "易联数科", "易联数科");
 
 	@EnumValue
 	private int code;

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

@@ -136,6 +136,7 @@ public class SysDeptSubServiceImpl extends ServiceImpl<SysDeptSubMapper, SysDept
 				SysDeptSub updateDeptSub = new SysDeptSub();
 				updateDeptSub.setSubId(queryDeptSub.getSubId());
 				updateDeptSub.setSubjectChannel(sysDeptSub.getSubjectChannel() == null ? 0 : sysDeptSub.getSubjectChannel());
+				updateDeptSub.setSubjectLocation(sysDeptSub.getSubjectLocation());
 				updateDeptSub.setSubjectInvoiceCategory(sysDeptSub.getSubjectInvoiceCategory());
 				updateDeptSub.setLimitAmount(sysDeptSub.getLimitAmount());
 				updateDeptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
@@ -147,6 +148,7 @@ public class SysDeptSubServiceImpl extends ServiceImpl<SysDeptSubMapper, SysDept
 				insertDeptSub.setDeptId(input.getDeptId());
 				insertDeptSub.setSubjectType(sysDeptSub.getSubjectType());
 				insertDeptSub.setSubjectChannel(sysDeptSub.getSubjectChannel() == null ? 0 : sysDeptSub.getSubjectChannel());
+				insertDeptSub.setSubjectLocation(sysDeptSub.getSubjectLocation());
 				insertDeptSub.setSubjectInvoiceCategory(sysDeptSub.getSubjectInvoiceCategory());
 				insertDeptSub.setLimitAmount(sysDeptSub.getLimitAmount());
 				insertDeptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());