feat：发票及来账相关接口移至scfs-api-service

pom.xml

@@ -25,7 +25,6 @@
         <module>scfs-api-sm</module>
         <module>scfs-api-spring-boot-starter</module>
         <module>scfs-api-test</module>
-        <module>scfs-api-service-accountant</module>
     </modules>
 
     <dependencies>
@@ -100,11 +99,6 @@
                 <artifactId>scfs-api-service-equity</artifactId>
                 <version>2.0.4</version>
             </dependency>
-            <dependency>
-                <groupId>com.czcb.scfs</groupId>
-                <artifactId>scfs-api-service-accountant</artifactId>
-                <version>2.0.4</version>
-            </dependency>
             <dependency>
                 <groupId>com.czcb.scfs</groupId>
                 <artifactId>scfs-api-sm</artifactId>

scfs-api-service-accountant/pom.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.czcb.scfs</groupId>
-        <artifactId>scfs-api-sdk</artifactId>
-        <version>2.0.4</version>
-    </parent>
-
-    <artifactId>scfs-api-service-accountant</artifactId>
-    <version>2.0.4</version>
-    <name>scfs-api-service-accountant:财务中心对外接口</name>
-    <description>财务中心SDK</description>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-            <version>2.7.16</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.30</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.czcb.scfs</groupId>
-            <artifactId>scfs-api-core</artifactId>
-            <version>2.0.4</version>
-        </dependency>
-    </dependencies>
-
-</project>

scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/configuration/ScfsApiServiceAccountantAutoConfiguration.java

@@ -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);
-    }
-}

scfs-api-service-accountant/src/main/java/com/czcb/scfs/service/accountant/recharge/OfflineRechargeService.java

@@ -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<OfflineRechargeDetailQueryResponse> 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<OfflineRechargeDetailUnmatchedQueryResponse> httpResponse = apiClient.post(url, headers, request.toJsonRequest(), OfflineRechargeDetailUnmatchedQueryResponse.class);
-        return httpResponse.getServiceResponse();
-    }
-
-}

scfs-api-service-accountant/src/main/resources/META-INF/spring.factories

@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.czcb.scfs.service.accountant.configuration.ScfsApiServiceAccountantAutoConfiguration

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

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;

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;

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;
 
 /**

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java

@@ -158,4 +158,26 @@ public class PayService {
         HttpResponse<EntPayAgrtQueryListResponse> 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<OfflineRechargeDetailQueryResponse> 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<OfflineRechargeDetailUnmatchedQueryResponse> httpResponse = apiClient.post(url, headers, request.toJsonRequest(), OfflineRechargeDetailUnmatchedQueryResponse.class);
+        return httpResponse.getServiceResponse();
+    }
 }

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;

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;

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;

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;

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);
+    }
 }

scfs-api-test/pom.xml

@@ -33,11 +33,6 @@
             <artifactId>scfs-api-service-equity</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.czcb.scfs</groupId>
-            <artifactId>scfs-api-service-accountant</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>