From ba79e6283dad04c3f598c8047c32663084a013f6 Mon Sep 17 00:00:00 2001 From: wb1496 Date: Tue, 23 Jul 2024 16:06:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scfs-api-service-equity/pom.xml | 36 ----- ...ScfsApiServiceEquityAutoConfiguration.java | 23 --- .../equity/invoice/InvoiceService.java | 87 ---------- .../invoice/model/InvoiceAddRequest.java | 110 ------------- .../invoice/model/InvoiceAddResponse.java | 43 ----- .../invoice/model/InvoiceDelRequest.java | 69 -------- .../invoice/model/InvoiceDelResponse.java | 43 ----- .../invoice/model/InvoiceInvalidRequest.java | 72 --------- .../invoice/model/InvoiceInvalidResponse.java | 43 ----- .../invoice/model/InvoiceMatchRequest.java | 82 ---------- .../invoice/model/InvoiceMatchResponse.java | 43 ----- .../invoice/model/InvoiceQueryRequest.java | 100 ------------ .../invoice/model/InvoiceQueryResponse.java | 148 ------------------ .../model/InvoiceTransQueryRequest.java | 58 ------- .../model/InvoiceTransQueryResponse.java | 133 ---------------- .../main/resources/META-INF/spring.factories | 2 - ...ApiServiceEquityAutoConfigurationTest.java | 9 -- 17 files changed, 1101 deletions(-) delete mode 100644 scfs-api-service-equity/pom.xml delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/configuration/ScfsApiServiceEquityAutoConfiguration.java delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/InvoiceService.java delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceAddRequest.java delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceAddResponse.java delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceDelRequest.java delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceDelResponse.java delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceInvalidRequest.java delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceInvalidResponse.java delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceMatchRequest.java delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceMatchResponse.java delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryRequest.java delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryResponse.java delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryRequest.java delete mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryResponse.java delete mode 100644 scfs-api-service-equity/src/main/resources/META-INF/spring.factories delete mode 100644 scfs-api-service-equity/src/test/java/com/czcb/scfs/service/equity/configuration/ScfsApiServiceEquityAutoConfigurationTest.java diff --git a/scfs-api-service-equity/pom.xml b/scfs-api-service-equity/pom.xml deleted file mode 100644 index 2c920bf..0000000 --- a/scfs-api-service-equity/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - - com.czcb.scfs - scfs-api-sdk - 2.0.4 - - - scfs-api-service-equity - scfs-api-service-equity - 权益类 - - - - org.springframework.boot - spring-boot-autoconfigure - 2.7.16 - - - - org.projectlombok - lombok - 1.18.30 - - - - com.czcb.scfs - scfs-api-core - 2.0.4 - - - - \ No newline at end of file diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/configuration/ScfsApiServiceEquityAutoConfiguration.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/configuration/ScfsApiServiceEquityAutoConfiguration.java deleted file mode 100644 index 77109be..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/configuration/ScfsApiServiceEquityAutoConfiguration.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.czcb.scfs.service.equity.configuration; - -import com.czcb.scfs.api.core.ApiClient; -import com.czcb.scfs.service.equity.invoice.InvoiceService; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -/** - * @author wangwei - * @date 2024/7/1 - */ -@Configuration -@ComponentScan("com.czcb.scfs.service.equity") -public class ScfsApiServiceEquityAutoConfiguration { - - @Bean - @ConditionalOnMissingBean - public InvoiceService invoiceService(ApiClient apiClient) { - return new InvoiceService(apiClient); - } -} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/InvoiceService.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/InvoiceService.java deleted file mode 100644 index da114ae..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/InvoiceService.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.czcb.scfs.service.equity.invoice; - -import com.czcb.scfs.api.core.ApiClient; -import com.czcb.scfs.api.core.http.HttpHeaders; -import com.czcb.scfs.api.core.http.HttpResponse; -import com.czcb.scfs.service.equity.invoice.model.*; - -import static com.czcb.scfs.api.core.Constants.API_VERSION; -import static com.czcb.scfs.api.core.Constants.V_2; - -/** - * @author wangwei - * @date 2024/7/1 - */ -public class InvoiceService { - private final ApiClient apiClient; - - public InvoiceService(ApiClient apiClient) { - this.apiClient = apiClient; - } - - /** - * 添加发票 - */ - public InvoiceAddResponse add(InvoiceAddRequest request) { - String url = "/invoice/add"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_2); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), InvoiceAddResponse.class); - return httpResponse.getServiceResponse(); - } - - /** - * 删除发票 - */ - public InvoiceDelResponse del(InvoiceDelRequest request) { - String url = "/invoice/del"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_2); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), InvoiceDelResponse.class); - return httpResponse.getServiceResponse(); - } - - /** - * 作废发票 - */ - public InvoiceInvalidResponse invalid(InvoiceInvalidRequest request) { - String url = "/invoice/invalid"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_2); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), InvoiceInvalidResponse.class); - return httpResponse.getServiceResponse(); - } - - /** - * 查询 - */ - public InvoiceQueryResponse query(InvoiceQueryRequest request) { - String url = "/invoice/query"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_2); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), InvoiceQueryResponse.class); - return httpResponse.getServiceResponse(); - } - - /** - * 发票匹配 - */ - public InvoiceMatchResponse match(InvoiceMatchRequest request) { - String url = "/invoice/settle/match"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_2); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), InvoiceMatchResponse.class); - return httpResponse.getServiceResponse(); - } - - /** - * 查询流水 - */ - public InvoiceTransQueryResponse transQuery(InvoiceTransQueryRequest request) { - String url = "/invoice/trans/query"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_2); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), InvoiceTransQueryResponse.class); - return httpResponse.getServiceResponse(); - } -} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceAddRequest.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceAddRequest.java deleted file mode 100644 index 0fb6fec..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceAddRequest.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.czcb.scfs.service.equity.invoice.model; - -import com.czcb.scfs.api.core.ApiRequest; -import com.czcb.scfs.api.core.agrs.TransType; -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @author wangwei - * @since 2024/7/8 - */ -@Data -@Accessors(chain = true) -@TransType("243301") -public class InvoiceAddRequest implements ApiRequest { - /** - * 渠道编号 - */ - @SerializedName("channel_no") - private String channelNo; - - /** - * 应用编号 - */ - @SerializedName("app_no") - private String appNo; - - /** - * 流水号 - */ - @SerializedName("serial_no") - private String serialNo; - - /** - * 操作日期 - */ - @SerializedName("trans_date") - private String transDate; - - /** - * 操作时间 - */ - @SerializedName("trans_tradetime") - private String transTradeTime; - - /** - * 发票编号 - */ - @SerializedName("invoice_no") - private String invoiceNo; - /** - * 发票类型 1、通用发票 2、累计循环发票 - */ - @SerializedName("invoice_type") - private String invoiceType; - /** - * 发票登记日期 - */ - @SerializedName("invoice_register_date") - private Date invoiceRegisterDate; - /** - * 付款账户账号 - */ - @SerializedName("account_no") - private String accountNo; - /** - * 付款账户户名 - */ - @SerializedName("account_name") - private String accountName; - /** - * 收款账户账号（入账账户） - */ - @SerializedName("opp_account_no") - private String oppAccountNo; - /** - * 收款账户户名（入账账户） - */ - @SerializedName("opp_account_name") - private String oppAccountName; - /** - * 归集账户账号（待清算账户/可控电商A2） - */ - @SerializedName("settle_account_no") - private String settleAccountNo; - /** - * 归集账户户名（待清算账户/可控电商A2） - */ - @SerializedName("settle_account_name") - private String settleAccountName; - /** - * 发票归属日期起 - */ - @SerializedName("invoice_belong_start_date") - private Date invoiceBelongStartDate; - /** - * 发票归属日期止 - */ - @SerializedName("invoice_belong_end_date") - private Date invoiceBelongEndDate; - /** - * 发票金额 - */ - @SerializedName("invoice_amount") - private BigDecimal invoiceAmount; -} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceAddResponse.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceAddResponse.java deleted file mode 100644 index 28c8d45..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceAddResponse.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.czcb.scfs.service.equity.invoice.model; - -import com.czcb.scfs.api.core.ApiRequest; -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author wangwei - * @since 2024/7/8 - */ -@Data -@Accessors(chain = true) -public class InvoiceAddResponse implements ApiRequest { - /** - * 000000：表示成功 - */ - @SerializedName("recode") - private String recode; - - /** - * 结果信息 - */ - @SerializedName("recode_info") - private String recodeInfo; - /** - * 系统流水号 - */ - @SerializedName("sys_serial_no") - private String sysSerialNo; - - /** - * 系统日期（YYYY-MM-DD） - */ - @SerializedName("sys_date") - private String sysDate; - - /** - * 系统时间（YYYY-MM-DD hh:mm:ss） - */ - @SerializedName("sys_time") - private String sysTime; -} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceDelRequest.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceDelRequest.java deleted file mode 100644 index c4dff81..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceDelRequest.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.czcb.scfs.service.equity.invoice.model; - -import com.czcb.scfs.api.core.ApiRequest; -import com.czcb.scfs.api.core.agrs.TransType; -import com.czcb.scfs.api.core.util.DateTimes; -import com.czcb.scfs.api.core.validation.Size; -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Arrays; -import java.util.List; - -/** - * @author wangwei - * @since 2024/7/8 - */ -@Data -@Accessors(chain = true) -@TransType("243300") -public class InvoiceDelRequest implements ApiRequest { - /** - * 渠道编号 - */ - @SerializedName("channel_no") - private String channelNo; - - /** - * 应用编号 - */ - @SerializedName("app_no") - private String appNo; - - /** - * 流水号 - */ - @SerializedName("serial_no") - private String serialNo; - - /** - * 操作日期 - */ - @SerializedName("trans_date") - private String transDate; - - /** - * 操作时间 - */ - @SerializedName("trans_tradetime") - private String transTradeTime; - - /** - * 发票编号 - */ - @Size(min = 1, max = 50, message = "数据条数1-50") - @SerializedName("invoice_nos") - private List invoiceNos; - - public static InvoiceDelRequest of(String channelNo, String appNo, String serialNo, String... invoiceNos) { - InvoiceDelRequest request = new InvoiceDelRequest(); - request.setChannelNo(channelNo); - request.setAppNo(appNo); - request.setSerialNo(serialNo); - request.setTransDate(DateTimes.ofNowDate()); - request.setTransTradeTime(DateTimes.ofNow()); - request.setInvoiceNos(Arrays.asList(invoiceNos)); - return request; - } -} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceDelResponse.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceDelResponse.java deleted file mode 100644 index 0d3d290..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceDelResponse.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.czcb.scfs.service.equity.invoice.model; - -import com.czcb.scfs.api.core.PageApiResponse; -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author wangwei - * @since 2024/7/8 - */ -@Data -@Accessors(chain = true) -public class InvoiceDelResponse implements PageApiResponse { - /** - * 000000：表示成功 - */ - @SerializedName("recode") - private String recode; - - /** - * 结果信息 - */ - @SerializedName("recode_info") - private String recodeInfo; - /** - * 系统流水号 - */ - @SerializedName("sys_serial_no") - private String sysSerialNo; - - /** - * 系统日期（YYYY-MM-DD） - */ - @SerializedName("sys_date") - private String sysDate; - - /** - * 系统时间（YYYY-MM-DD hh:mm:ss） - */ - @SerializedName("sys_time") - private String sysTime; -} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceInvalidRequest.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceInvalidRequest.java deleted file mode 100644 index d5e813b..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceInvalidRequest.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.czcb.scfs.service.equity.invoice.model; - -import com.czcb.scfs.api.core.ApiRequest; -import com.czcb.scfs.api.core.agrs.TransType; -import com.czcb.scfs.api.core.util.DateTimes; -import com.czcb.scfs.api.core.validation.Size; -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Arrays; -import java.util.List; - -/** - * @author wangwei - * @since 2024/7/8 - */ -@Data -@Accessors(chain = true) -@TransType("243302") -public class InvoiceInvalidRequest implements ApiRequest { - /** - * 渠道编号 - */ - @SerializedName("channel_no") - private String channelNo; - - /** - * 应用编号 - */ - @SerializedName("app_no") - private String appNo; - - /** - * 流水号 - */ - @SerializedName("serial_no") - private String serialNo; - - /** - * 操作日期 - */ - @SerializedName("trans_date") - private String transDate; - - /** - * 操作时间 - */ - @SerializedName("trans_tradetime") - private String transTradeTime; - - @SerializedName("invalid") - private String invalid = "1"; - - /** - * 发票编号 - */ - @Size(min = 1, max = 50, message = "数据条数1-50") - @SerializedName("invoice_nos") - private List invoiceNos; - - public static InvoiceInvalidRequest of(String channelNo, String appNo, String serialNo, String... invoiceNos) { - InvoiceInvalidRequest request = new InvoiceInvalidRequest(); - request.setChannelNo(channelNo); - request.setAppNo(appNo); - request.setSerialNo(serialNo); - request.setTransDate(DateTimes.ofNowDate()); - request.setTransTradeTime(DateTimes.ofNow()); - request.setInvoiceNos(Arrays.asList(invoiceNos)); - return request; - } -} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceInvalidResponse.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceInvalidResponse.java deleted file mode 100644 index 2e8002c..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceInvalidResponse.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.czcb.scfs.service.equity.invoice.model; - -import com.czcb.scfs.api.core.PageApiResponse; -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author wangwei - * @since 2024/7/8 - */ -@Data -@Accessors(chain = true) -public class InvoiceInvalidResponse implements PageApiResponse { - /** - * 000000：表示成功 - */ - @SerializedName("recode") - private String recode; - - /** - * 结果信息 - */ - @SerializedName("recode_info") - private String recodeInfo; - /** - * 系统流水号 - */ - @SerializedName("sys_serial_no") - private String sysSerialNo; - - /** - * 系统日期（YYYY-MM-DD） - */ - @SerializedName("sys_date") - private String sysDate; - - /** - * 系统时间（YYYY-MM-DD hh:mm:ss） - */ - @SerializedName("sys_time") - private String sysTime; -} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceMatchRequest.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceMatchRequest.java deleted file mode 100644 index 4ba708c..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceMatchRequest.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.czcb.scfs.service.equity.invoice.model; - -import com.czcb.scfs.api.core.ApiRequest; -import com.czcb.scfs.api.core.agrs.TransType; -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * @author wangwei - * @since 2024/7/8 - */ -@Data -@Accessors(chain = true) -@TransType("243304") -public class InvoiceMatchRequest implements ApiRequest { - /** - * 渠道编号 - */ - @SerializedName("channel_no") - private String channelNo; - - /** - * 应用编号 - */ - @SerializedName("app_no") - private String appNo; - - /** - * 流水号 - */ - @SerializedName("serial_no") - private String serialNo; - - /** - * 操作日期 - */ - @SerializedName("trans_date") - private String transDate; - - /** - * 操作时间 - */ - @SerializedName("trans_tradetime") - private String transTradeTime; - - /** - * 发票编号 - */ - @SerializedName("invoice_no") - private String invoiceNo; - - /** - * 来账流水号 - */ - @SerializedName("deposit_serial_no") - private String depositSerialNo; - - /** - * 付款账户账号 - */ - @SerializedName("account_no") - private String accountNo; - /** - * 付款账户户名 - */ - @SerializedName("account_name") - private String accountName; - /** - * 结算金额 - */ - @SerializedName("settle_amount") - private BigDecimal settleAmount; - - /** - * 匹配类型 - */ - @SerializedName("match_type") - private String matchType; -} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceMatchResponse.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceMatchResponse.java deleted file mode 100644 index 26b924c..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceMatchResponse.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.czcb.scfs.service.equity.invoice.model; - -import com.czcb.scfs.api.core.ApiRequest; -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author wangwei - * @since 2024/7/8 - */ -@Data -@Accessors(chain = true) -public class InvoiceMatchResponse implements ApiRequest { - /** - * 000000：表示成功 - */ - @SerializedName("recode") - private String recode; - - /** - * 结果信息 - */ - @SerializedName("recode_info") - private String recodeInfo; - /** - * 系统流水号 - */ - @SerializedName("sys_serial_no") - private String sysSerialNo; - - /** - * 系统日期（YYYY-MM-DD） - */ - @SerializedName("sys_date") - private String sysDate; - - /** - * 系统时间（YYYY-MM-DD hh:mm:ss） - */ - @SerializedName("sys_time") - private String sysTime; -} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryRequest.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryRequest.java deleted file mode 100644 index e5e715e..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryRequest.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.czcb.scfs.service.equity.invoice.model; - -import com.czcb.scfs.api.core.PageApiRequest; -import com.czcb.scfs.api.core.agrs.TransType; -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author wangwei - * @since 2024/7/8 - */ -@Data -@Accessors(chain = true) -@TransType("243303") -public class InvoiceQueryRequest implements PageApiRequest { - /** - * 渠道编号 - */ - @SerializedName("channel_no") - private String channelNo; - - /** - * 应用编号 - */ - @SerializedName("app_no") - private String appNo; - - /** - * 流水号 - */ - @SerializedName("serial_no") - private String serialNo; - - /** - * 操作日期 - */ - @SerializedName("trans_date") - private String transDate; - - /** - * 操作时间 - */ - @SerializedName("trans_tradetime") - private String transTradeTime; - - /** - * 发票编号 - */ - @SerializedName("invoice_no") - private String invoiceNo; - /** - * 发票登记日期-开始 - */ - @SerializedName("invoice_register_date_start") - private String invoiceRegisterDateStart; - - /** - * 发票登记日期-开始 - */ - @SerializedName("invoice_register_date_end") - private String invoiceRegisterDateEnd; - - /** - * 付款账户账号 - */ - @SerializedName("account_no") - private String accountNo; - /** - * 付款账户户名 - */ - @SerializedName("account_name") - private String accountName; - /** - * 收款账户账号（入账账户） - */ - @SerializedName("opp_account_no") - private String oppAccountNo; - /** - * 收款账户户名（入账账户） - */ - @SerializedName("opp_account_name") - private String oppAccountName; - /** - * 归集账户账号（待清算账户/可控电商A2） - */ - @SerializedName("settle_account_no") - private String settleAccountNo; - /** - * 归集账户户名（待清算账户/可控电商A2） - */ - @SerializedName("settle_account_name") - private String settleAccountName; - - @SerializedName("current_page") - private Long currentPage; - - @SerializedName("current_rows") - private Long currentRows; -} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryResponse.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryResponse.java deleted file mode 100644 index 8ca8e48..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryResponse.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.czcb.scfs.service.equity.invoice.model; - -import com.czcb.scfs.api.core.PageApiResponse; -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; - -/** - * @author wangwei - * @since 2024/7/8 - */ -@Data -@Accessors(chain = true) -public class InvoiceQueryResponse implements PageApiResponse { - /** - * 000000：表示成功 - */ - @SerializedName("recode") - private String recode; - - /** - * 结果信息 - */ - @SerializedName("recode_info") - private String recodeInfo; - /** - * 系统流水号 - */ - @SerializedName("sys_serial_no") - private String sysSerialNo; - - /** - * 系统日期（YYYY-MM-DD） - */ - @SerializedName("sys_date") - private String sysDate; - - /** - * 系统时间（YYYY-MM-DD hh:mm:ss） - */ - @SerializedName("sys_time") - private String sysTime; - - @SerializedName("data") - private List data; - - @SerializedName("current_page") - private Long currentPage; - - @SerializedName("total_page") - private Long totalPage; - - @SerializedName("total_rows") - private Long totalRows; - - @Data - public static class InvoiceData implements Serializable { - /** - * 发票编号 - */ - @SerializedName("invoice_no") - private String invoiceNo; - /** - * 发票类型 1、通用发票 2、累计循环发票 - */ - @SerializedName("invoice_type") - private String invoiceType; - /** - * 发票登记日期 - */ - @SerializedName("invoice_register_date") - private String invoiceRegisterDate; - /** - * 付款账户账号 - */ - @SerializedName("account_no") - private String accountNo; - /** - * 付款账户户名 - */ - @SerializedName("account_name") - private String accountName; - /** - * 收款账户账号（入账账户） - */ - @SerializedName("opp_account_no") - private String oppAccountNo; - /** - * 收款账户户名（入账账户） - */ - @SerializedName("opp_account_name") - private String oppAccountName; - /** - * 归集账户账号（待清算账户/可控电商A2） - */ - @SerializedName("settle_account_no") - private String settleAccountNo; - /** - * 归集账户户名（待清算账户/可控电商A2） - */ - @SerializedName("settle_account_name") - private String settleAccountName; - /** - * 发票归属日期起 - */ - @SerializedName("invoice_belong_start_date") - private String invoiceBelongStartDate; - /** - * 发票归属日期止 - */ - @SerializedName("invoice_belong_end_date") - private String invoiceBelongEndDate; - /** - * 发票金额 - */ - @SerializedName("invoice_amount") - private BigDecimal invoiceAmount; - /** - * 发票状态 - */ - @SerializedName("invoice_status") - private String invoiceStatus; - /** - * 已结算金额 - */ - @SerializedName("settle_amount") - private BigDecimal settleAmount; - /** - * 结算状态 0、未结算 1、已结算 2、部分结算 - */ - @SerializedName("settle_status") - private String settleStatus; - /** - * 创建时间 - */ - @SerializedName("create_time") - private String createTime; - /** - * 更新时间 - */ - @SerializedName("update_time") - private String updateTime; - } -} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryRequest.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryRequest.java deleted file mode 100644 index 33dee13..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryRequest.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.czcb.scfs.service.equity.invoice.model; - -import com.czcb.scfs.api.core.PageApiRequest; -import com.czcb.scfs.api.core.agrs.TransType; -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author wangwei - * @since 2024/7/8 - */ -@Data -@Accessors(chain = true) -@TransType("243303") -public class InvoiceTransQueryRequest implements PageApiRequest { - /** - * 渠道编号 - */ - @SerializedName("channel_no") - private String channelNo; - - /** - * 应用编号 - */ - @SerializedName("app_no") - private String appNo; - - /** - * 流水号 - */ - @SerializedName("serial_no") - private String serialNo; - - /** - * 操作日期 - */ - @SerializedName("trans_date") - private String transDate; - - /** - * 操作时间 - */ - @SerializedName("trans_tradetime") - private String transTradeTime; - - /** - * 发票编号 - */ - @SerializedName("invoice_no") - private String invoiceNo; - - @SerializedName("current_page") - private Long currentPage; - - @SerializedName("current_rows") - private Long currentRows; -} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryResponse.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryResponse.java deleted file mode 100644 index ca0e35f..0000000 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryResponse.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.czcb.scfs.service.equity.invoice.model; - -import com.czcb.scfs.api.core.PageApiResponse; -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; - -/** - * @author wangwei - * @since 2024/7/8 - */ -@Data -@Accessors(chain = true) -public class InvoiceTransQueryResponse implements PageApiResponse { - /** - * 000000：表示成功 - */ - @SerializedName("recode") - private String recode; - - /** - * 结果信息 - */ - @SerializedName("recode_info") - private String recodeInfo; - /** - * 系统流水号 - */ - @SerializedName("sys_serial_no") - private String sysSerialNo; - - /** - * 系统日期（YYYY-MM-DD） - */ - @SerializedName("sys_date") - private String sysDate; - - /** - * 系统时间（YYYY-MM-DD hh:mm:ss） - */ - @SerializedName("sys_time") - private String sysTime; - - @SerializedName("data") - private List data; - - @SerializedName("current_page") - private Long currentPage; - - @SerializedName("total_page") - private Long totalPage; - - @SerializedName("total_rows") - private Long totalRows; - - @Data - public static class InvoiceTransData implements Serializable { - /** - * 发票编号 - */ - @SerializedName("invoice_no") - private String invoiceNo; - /** - * 来账流水号 - */ - @SerializedName("deposit_serial_no") - private String depositSerialNo; - /** - * 付款账户账号 - */ - @SerializedName("account_no") - private String accountNo; - /** - * 付款账户户名 - */ - @SerializedName("account_name") - private String accountName; - /** - * 收款账户账号（入账账户） - */ - @SerializedName("opp_account_no") - private String oppAccountNo; - /** - * 收款账户户名（入账账户） - */ - @SerializedName("opp_account_name") - private String oppAccountName; - /** - * 归集账户账号（待清算账户/可控电商A2） - */ - @SerializedName("settle_account_no") - private String settleAccountNo; - /** - * 归集账户户名（待清算账户/可控电商A2） - */ - @SerializedName("settle_account_name") - private String settleAccountName; - /** - * 发票金额 - */ - @SerializedName("invoice_amount") - private BigDecimal invoiceAmount; - /** - * 已结算金额 - */ - @SerializedName("settle_amount") - private BigDecimal settleAmount; - /** - * 1、自动匹配 2、人工匹配 - */ - @SerializedName("match_type") - private String matchType; - /** - * 0、未匹配 1、匹配成功 - */ - @SerializedName("match_status") - private String matchStatus; - /** - * 创建时间 - */ - @SerializedName("create_time") - private String createTime; - /** - * 更新时间 - */ - @SerializedName("update_time") - private String updateTime; - } -} diff --git a/scfs-api-service-equity/src/main/resources/META-INF/spring.factories b/scfs-api-service-equity/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 16bd094..0000000 --- a/scfs-api-service-equity/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.czcb.scfs.service.equity.configuration.ScfsApiServiceEquityAutoConfiguration \ No newline at end of file diff --git a/scfs-api-service-equity/src/test/java/com/czcb/scfs/service/equity/configuration/ScfsApiServiceEquityAutoConfigurationTest.java b/scfs-api-service-equity/src/test/java/com/czcb/scfs/service/equity/configuration/ScfsApiServiceEquityAutoConfigurationTest.java deleted file mode 100644 index ec2d6a3..0000000 --- a/scfs-api-service-equity/src/test/java/com/czcb/scfs/service/equity/configuration/ScfsApiServiceEquityAutoConfigurationTest.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.czcb.scfs.service.equity.configuration; - -/** - * @author wangwei - * @date 2024/7/1 - */ -class ScfsApiServiceEquityAutoConfigurationTest { - -} \ No newline at end of file