feat: 结算配置管理

db/v2.0/220720.sql

@@ -24,3 +24,8 @@ create table sys_user_ext_record
 )
     comment '用户认证相关的扩展信息';
 
+
+-- 新增字段
+alter table sys_dept_sub
+    add subject_location varchar(20) null comment '税源地' after subject_channel;
+

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

@@ -3,14 +3,13 @@ package com.qunzhixinxi.hnqz.admin.entity;
 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.SubjectTypeEnum;
+import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -55,6 +54,12 @@ public class SysDeptSub extends Model<SysDeptSub> {
 	@ApiModelProperty(value = "结算通道")
 	private Integer subjectChannel;
 
+	/**
+	 * 结算通道
+	 */
+	@ApiModelProperty(value = "结算通道")
+	private SubjectLocation subjectLocation;
+
 	@ApiModelProperty(value = "限额")
 	private BigDecimal limitAmount;
 

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

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.entity.dto;
 
+import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -46,6 +47,11 @@ public class SettleConfigDTO implements Serializable {
 		 */
 		private Integer subjectChannel;
 
+		/**
+		 * 税源地
+		 */
+		private SubjectLocation subjectLocation;
+
 		/**
 		 * 限额
 		 */

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

@@ -1,7 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.entity.dto;
 
 import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
-import com.qunzhixinxi.hnqz.admin.enums.SubjectChannel1;
+import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -72,7 +72,7 @@ public class UserSignCertDTO implements Serializable {
 	/**
 	 * 结算通道
 	 */
-	private List<SubjectChannel1> subjectChannelList;
+	private List<SubjectLocation> subjectChannelList;
 
 	/**
 	 * 验证码

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SubjectChannel1.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SubjectLocation.java

@@ -5,11 +5,11 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 结算通道
+ * 税源地
  */
 @Getter
 @AllArgsConstructor
-public enum SubjectChannel1 {
+public enum SubjectLocation {
 
 	// 仁励家通道
 	REN_LI_JIA("REN_LI_JIA", GigTypeEnum.REN_LI_JIA, "仁励家"),

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

@@ -5,7 +5,7 @@ import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
 import com.qunzhixinxi.hnqz.admin.entity.dto.UserSignCertDTO;
 import com.qunzhixinxi.hnqz.admin.entity.vo.SysUserSubVO;
 import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
-import com.qunzhixinxi.hnqz.admin.enums.SubjectChannel1;
+import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 
 import java.util.List;
 import java.util.Map;
@@ -51,7 +51,7 @@ public interface SysUserSignCertService {
 	 * @param subjectChannel
 	 * @return
 	 */
-	Map<String, Object> listCertInfo(String idCard, String enterprisCode, List<SubjectChannel1> subjectChannel);
+	Map<String, Object> listCertInfo(String idCard, String enterprisCode, List<SubjectLocation> subjectChannel);
 
 	/**
 	 * 保存用户基础信息

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

@@ -16,7 +16,6 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.config.TaxNotifyConfig;
 import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
-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;
@@ -34,8 +33,7 @@ import com.qunzhixinxi.hnqz.admin.enums.MemberType;
 import com.qunzhixinxi.hnqz.admin.enums.OladingCertStatus;
 import com.qunzhixinxi.hnqz.admin.enums.PayChannel;
 import com.qunzhixinxi.hnqz.admin.enums.RenlijiaCertStatus;
-import com.qunzhixinxi.hnqz.admin.enums.SubjectChannel1;
-import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
+import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 import com.qunzhixinxi.hnqz.admin.enums.YeeCertStatus;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptSubService;
@@ -45,7 +43,6 @@ import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
 import com.qunzhixinxi.hnqz.admin.service.gig.SysUserSignCertService;
 import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.entity.BaseMap;
-import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.rabbitmq.client.RabbitMqClient;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
@@ -59,7 +56,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -181,7 +177,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 	 * @return
 	 */
 	@Override
-	public Map<String, Object> listCertInfo(String idCard, String enterprisCode, List<SubjectChannel1> subjectChannel) {
+	public Map<String, Object> listCertInfo(String idCard, String enterprisCode, List<SubjectLocation> subjectChannel) {
 		Map<String, Object> params = new HashMap<>(3);
 		params.put("idCard", idCard);
 		params.put("enterprisCode", enterprisCode);