diff --git a/pom.xml b/pom.xml index 3ab4ad5..2a8d154 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,6 @@ scfs-api-sm scfs-api-spring-boot-starter scfs-api-test - scfs-api-service-accountant @@ -100,11 +99,6 @@ scfs-api-service-equity 2.0.4 - - com.czcb.scfs - scfs-api-service-accountant - 2.0.4 - com.czcb.scfs scfs-api-sm diff --git a/scfs-api-service-accountant/pom.xml b/scfs-api-service-accountant/pom.xml deleted file mode 100644 index 89c9c85..0000000 --- a/scfs-api-service-accountant/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - - com.czcb.scfs - scfs-api-sdk - 2.0.4 - - - scfs-api-service-accountant - 2.0.4 - scfs-api-service-accountant:财务中心对外接口 - 财务中心SDK - jar - - - - 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-accountant/src/main/java/com/czcb/scfs/service/accountant/configuration/ScfsApiServiceAccountantAutoConfiguration.java b/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/configuration/ScfsApiServiceAccountantAutoConfiguration.java deleted file mode 100644 index 0169056..0000000 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/configuration/ScfsApiServiceAccountantAutoConfiguration.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.czcb.scfs.service.accountant.configuration; - -import com.czcb.scfs.api.core.ApiClient; -import com.czcb.scfs.service.accountant.invoice.InvoiceService; -import com.czcb.scfs.service.accountant.recharge.OfflineRechargeService; -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 H.T - * @since 2024-07-22 - */ -@Configuration -@ComponentScan("com.czcb.scfs.service.accountant") -public class ScfsApiServiceAccountantAutoConfiguration { - - @Bean - @ConditionalOnMissingBean - public InvoiceService invoiceService(ApiClient apiClient) { - return new InvoiceService(apiClient); - } - - @Bean - @ConditionalOnMissingBean - public OfflineRechargeService offlineRechargeService(ApiClient apiClient) { - return new OfflineRechargeService(apiClient); - } -} diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/OfflineRechargeService.java b/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/OfflineRechargeService.java deleted file mode 100644 index d885551..0000000 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/OfflineRechargeService.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.czcb.scfs.service.accountant.recharge; - -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.accountant.recharge.model.OfflineRechargeDetailQueryRequest; -import com.czcb.scfs.service.accountant.recharge.model.OfflineRechargeDetailQueryResponse; -import com.czcb.scfs.service.accountant.recharge.model.OfflineRechargeDetailUnmatchedQueryRequest; -import com.czcb.scfs.service.accountant.recharge.model.OfflineRechargeDetailUnmatchedQueryResponse; - -import static com.czcb.scfs.api.core.Constants.API_VERSION; -import static com.czcb.scfs.api.core.Constants.V_2; - -/** - * 线下来账充值 - * - * @author H.T - * @since 2024-07-23 - */ -public class OfflineRechargeService { - - private final ApiClient apiClient; - - public OfflineRechargeService(ApiClient apiClient) { - this.apiClient = apiClient; - } - - /** - * 230907-线下充值明细查询 - */ - public OfflineRechargeDetailQueryResponse detailQuery(OfflineRechargeDetailQueryRequest request) { - String url = "/offline-recharge/details/query"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_2); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), OfflineRechargeDetailQueryResponse.class); - return httpResponse.getServiceResponse(); - } - - /** - * 230908-未匹配来账明细查询 - */ - public OfflineRechargeDetailUnmatchedQueryResponse detailUnmatchedQuery(OfflineRechargeDetailUnmatchedQueryRequest request) { - String url = "/offline-recharge/details/unmatched/query"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_2); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), OfflineRechargeDetailUnmatchedQueryResponse.class); - return httpResponse.getServiceResponse(); - } - -} diff --git a/scfs-api-service-accountant/src/main/resources/META-INF/spring.factories b/scfs-api-service-accountant/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 600cd68..0000000 --- a/scfs-api-service-accountant/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.czcb.scfs.service.accountant.configuration.ScfsApiServiceAccountantAutoConfiguration \ No newline at end of file diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/InvoiceService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/InvoiceService.java similarity index 96% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/InvoiceService.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/InvoiceService.java index 175d04b..40b1763 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/InvoiceService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/InvoiceService.java @@ -1,15 +1,15 @@ -package com.czcb.scfs.service.accountant.invoice; +package com.czcb.scfs.api.service.v2.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.accountant.invoice.model.*; +import com.czcb.scfs.api.service.v2.invoice.model.*; import static com.czcb.scfs.api.core.Constants.API_VERSION; import static com.czcb.scfs.api.core.Constants.V_2; /** - * 发票功能 + * 发票类 * * @author H.T * @since 2024-07-22 diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceDepositQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceDepositQueryRequest.java similarity index 94% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceDepositQueryRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceDepositQueryRequest.java index 7775f0d..45aeec9 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceDepositQueryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceDepositQueryRequest.java @@ -1,6 +1,5 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.invoice.model; -import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.PageApiRequest; import com.czcb.scfs.api.core.agrs.TransType; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceDepositQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceDepositQueryResponse.java similarity index 97% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceDepositQueryResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceDepositQueryResponse.java index ae4384e..e2118eb 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceDepositQueryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceDepositQueryResponse.java @@ -1,6 +1,5 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.invoice.model; -import com.czcb.scfs.api.core.ApiResponse; import com.czcb.scfs.api.core.PageApiResponse; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoInvalidRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoInvalidRequest.java similarity index 95% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoInvalidRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoInvalidRequest.java index ed73f58..879b106 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoInvalidRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoInvalidRequest.java @@ -1,10 +1,11 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.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.util.List; /** diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoInvalidResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoInvalidResponse.java similarity index 93% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoInvalidResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoInvalidResponse.java index 00b324f..adb9740 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoInvalidResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoInvalidResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.invoice.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoQueryRequest.java similarity index 97% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoQueryRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoQueryRequest.java index d15fc3a..6bdb6fa 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoQueryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoQueryRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.invoice.model; import com.czcb.scfs.api.core.PageApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoQueryResponse.java similarity index 98% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoQueryResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoQueryResponse.java index 40dd979..29a7c40 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoQueryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoQueryResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.invoice.model; import com.czcb.scfs.api.core.PageApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoSaveRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoSaveRequest.java similarity index 97% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoSaveRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoSaveRequest.java index 056f0c1..42a75c7 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoSaveRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoSaveRequest.java @@ -1,8 +1,7 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.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; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoSaveResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoSaveResponse.java similarity index 93% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoSaveResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoSaveResponse.java index 04ae689..cc002a8 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceInfoSaveResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoSaveResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.invoice.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleMatchRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleMatchRequest.java similarity index 97% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleMatchRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleMatchRequest.java index 5ed667f..2e55743 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleMatchRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleMatchRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.invoice.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleMatchResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleMatchResponse.java similarity index 96% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleMatchResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleMatchResponse.java index 7d09f35..305332f 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleMatchResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleMatchResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.invoice.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleQueryRequest.java similarity index 96% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleQueryRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleQueryRequest.java index f47c524..d99d329 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleQueryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleQueryRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.invoice.model; import com.czcb.scfs.api.core.PageApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleQueryResponse.java similarity index 97% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleQueryResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleQueryResponse.java index a217e1c..67ed44b 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleQueryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleQueryResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.invoice.model; import com.czcb.scfs.api.core.PageApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleRepayRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleRepayRequest.java similarity index 94% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleRepayRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleRepayRequest.java index f4db599..c057c1d 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleRepayRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleRepayRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.invoice.model; import com.czcb.scfs.api.core.PageApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleRepayResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleRepayResponse.java similarity index 94% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleRepayResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleRepayResponse.java index 6b1394a..88f23ac 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/invoice/model/InvoiceSettleRepayResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceSettleRepayResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.invoice.model; +package com.czcb.scfs.api.service.v2.invoice.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java index c62eb97..f803cd4 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java @@ -158,4 +158,26 @@ public class PayService { HttpResponse httpResponse = apiClient.post(url, headers, entPayAgrtQueryListRequest.toJsonRequest(), EntPayAgrtQueryListResponse.class); return httpResponse.getServiceResponse(); } + + /** + * 230907-线下充值明细查询 + */ + public OfflineRechargeDetailQueryResponse detailQuery(OfflineRechargeDetailQueryRequest request) { + String url = "/offline-recharge/details/query"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_2); + HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), OfflineRechargeDetailQueryResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 230908-未匹配来账明细查询 + */ + public OfflineRechargeDetailUnmatchedQueryResponse detailUnmatchedQuery(OfflineRechargeDetailUnmatchedQueryRequest request) { + String url = "/offline-recharge/details/unmatched/query"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_2); + HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), OfflineRechargeDetailUnmatchedQueryResponse.class); + return httpResponse.getServiceResponse(); + } } diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/model/OfflineRechargeDetailQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/OfflineRechargeDetailQueryRequest.java similarity index 95% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/model/OfflineRechargeDetailQueryRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/OfflineRechargeDetailQueryRequest.java index 3edab1e..fb55271 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/model/OfflineRechargeDetailQueryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/OfflineRechargeDetailQueryRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.recharge.model; +package com.czcb.scfs.api.service.v2.pay.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/model/OfflineRechargeDetailQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/OfflineRechargeDetailQueryResponse.java similarity index 98% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/model/OfflineRechargeDetailQueryResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/OfflineRechargeDetailQueryResponse.java index 5253039..70bc721 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/model/OfflineRechargeDetailQueryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/OfflineRechargeDetailQueryResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.recharge.model; +package com.czcb.scfs.api.service.v2.pay.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/model/OfflineRechargeDetailUnmatchedQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/OfflineRechargeDetailUnmatchedQueryRequest.java similarity index 96% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/model/OfflineRechargeDetailUnmatchedQueryRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/OfflineRechargeDetailUnmatchedQueryRequest.java index 1e5b704..35efaeb 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/model/OfflineRechargeDetailUnmatchedQueryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/OfflineRechargeDetailUnmatchedQueryRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.recharge.model; +package com.czcb.scfs.api.service.v2.pay.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/model/OfflineRechargeDetailUnmatchedQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/OfflineRechargeDetailUnmatchedQueryResponse.java similarity index 98% rename from scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/model/OfflineRechargeDetailUnmatchedQueryResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/OfflineRechargeDetailUnmatchedQueryResponse.java index e6f8c5d..1adf6dd 100644 --- a/scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/model/OfflineRechargeDetailUnmatchedQueryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/OfflineRechargeDetailUnmatchedQueryResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.service.accountant.recharge.model; +package com.czcb.scfs.api.service.v2.pay.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java b/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java index 92d67ea..ce3af90 100644 --- a/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java +++ b/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java @@ -10,6 +10,7 @@ import com.czcb.scfs.api.service.v2.bmd.BmdService; import com.czcb.scfs.api.service.v2.communal.CommunalDataService; import com.czcb.scfs.api.service.v2.face.FaceService; import com.czcb.scfs.api.service.v2.file.FileService; +import com.czcb.scfs.api.service.v2.invoice.InvoiceService; import com.czcb.scfs.api.service.v2.loan.LoanService; import com.czcb.scfs.api.service.v2.ocr.OcrService; import com.czcb.scfs.api.service.v2.pay.PayService; @@ -150,4 +151,13 @@ public class ScfsAutoConfiguration { public TransService transService(ApiClient apiClient) { return new TransService(apiClient); } + + /** + * 发票类 + */ + @Bean + @ConditionalOnClass(InvoiceService.class) + public InvoiceService invoiceService(ApiClient apiClient) { + return new InvoiceService(apiClient); + } } diff --git a/scfs-api-test/pom.xml b/scfs-api-test/pom.xml index f2acdf5..9a1b551 100644 --- a/scfs-api-test/pom.xml +++ b/scfs-api-test/pom.xml @@ -33,11 +33,6 @@ scfs-api-service-equity - - com.czcb.scfs - scfs-api-service-accountant - - org.springframework.boot spring-boot-starter-web