From 5ba923bb785bbb9cf18e862ecb7329d966dc5842 Mon Sep 17 00:00:00 2001 From: wb3298 <1111@qq.com> Date: Tue, 16 Dec 2025 15:25:44 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E5=86=9C=E9=83=BD=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/v2/ar/ContractInfoService.java | 4 +- .../model/ArContractInfoFindOneRequest.java | 2 +- .../model/ArContractInfoFindOneResponse.java | 2 +- .../model/ArContractInfoPageQueryRequest.java | 2 +- .../ArContractInfoPageQueryResponse.java | 2 +- .../v2/ar/model/ArOrderPurchaseDTO.java | 2 +- .../model/ArOrderPurchaseFindOneRequest.java | 2 +- .../model/ArOrderPurchaseFindOneResponse.java | 2 +- .../ArOrderPurchasePageQueryRequest.java | 2 +- .../ArOrderPurchasePageQueryResponse.java | 2 +- .../scfs/api/test/service/ArServiceTest.java | 228 ++++++++++++++++++ 11 files changed, 239 insertions(+), 11 deletions(-) create mode 100644 scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/ArServiceTest.java diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/ContractInfoService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/ContractInfoService.java index 7ccfa14..fdfaf1e 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/ContractInfoService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/ContractInfoService.java @@ -56,8 +56,8 @@ public class ContractInfoService { /** * 312109-合同作废(农都) */ - public ArContractInvalidResponse arContractAdd(ArContractInvalidRequest request) { - String url = "/ar-contract/add"; + public ArContractInvalidResponse arContractInvalid(ArContractInvalidRequest request) { + String url = "/ar-contract/invalid"; HttpResponse httpResponse = apiClient.post(url, HttpHeaders.apiVersionV2(), request.toJsonRequest(), ArContractInvalidResponse.class); return httpResponse.getServiceResponse(); diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoFindOneRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoFindOneRequest.java index f409cbe..48c0747 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoFindOneRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoFindOneRequest.java @@ -50,5 +50,5 @@ public class ArContractInfoFindOneRequest implements ApiRequest { @SerializedName("data") - private ArProjectInfoDTO data; + private ArContractInfoDTO data; } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoFindOneResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoFindOneResponse.java index 1a49646..318abcf 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoFindOneResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoFindOneResponse.java @@ -47,5 +47,5 @@ public class ArContractInfoFindOneResponse implements ApiResponse { @SerializedName("data") - private ArProjectInfoDTO data; + private ArContractInfoDTO data; } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoPageQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoPageQueryRequest.java index f63d64a..99de4ad 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoPageQueryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoPageQueryRequest.java @@ -60,5 +60,5 @@ public class ArContractInfoPageQueryRequest implements PageApiRequest { private Long currentRows; @SerializedName("data") - private ArProjectInfoDTO data; + private ArContractInfoDTO data; } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoPageQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoPageQueryResponse.java index 3f53c75..49aa38b 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoPageQueryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArContractInfoPageQueryResponse.java @@ -66,5 +66,5 @@ public class ArContractInfoPageQueryResponse implements PageApiResponse { @SerializedName("data") - private List data; + private List data; } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchaseDTO.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchaseDTO.java index b8c11d1..95fd8e1 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchaseDTO.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchaseDTO.java @@ -103,7 +103,7 @@ public class ArOrderPurchaseDTO implements Serializable { * 下单时间 */ @SerializedName("order_time") - private BigDecimal orderTime; + private String orderTime; /** * 订单描述 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchaseFindOneRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchaseFindOneRequest.java index fc334c1..47ad4a0 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchaseFindOneRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchaseFindOneRequest.java @@ -49,5 +49,5 @@ public class ArOrderPurchaseFindOneRequest implements ApiRequest { @SerializedName("data") - private ArOrderPurchaseGoodsDTO data; + private ArOrderPurchaseDTO data; } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchaseFindOneResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchaseFindOneResponse.java index 0184394..c41054a 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchaseFindOneResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchaseFindOneResponse.java @@ -48,5 +48,5 @@ public class ArOrderPurchaseFindOneResponse implements ApiResponse { @SerializedName("data") - private ArOrderPurchaseGoodsDTO data; + private ArOrderPurchaseDTO data; } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchasePageQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchasePageQueryRequest.java index e9a2a1f..36e9bf1 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchasePageQueryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchasePageQueryRequest.java @@ -60,5 +60,5 @@ public class ArOrderPurchasePageQueryRequest implements PageApiRequest { private Long currentRows; @SerializedName("data") - private ArOrderPurchaseGoodsDTO data; + private ArOrderPurchaseDTO data; } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchasePageQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchasePageQueryResponse.java index 5b3121a..d9482f3 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchasePageQueryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArOrderPurchasePageQueryResponse.java @@ -66,5 +66,5 @@ public class ArOrderPurchasePageQueryResponse implements PageApiResponse { @SerializedName("data") - private List data; + private List data; } diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/ArServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/ArServiceTest.java new file mode 100644 index 0000000..d62c3e2 --- /dev/null +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/ArServiceTest.java @@ -0,0 +1,228 @@ +package com.czcb.scfs.api.test.service; + + +import com.czcb.scfs.api.service.v2.ar.ContractInfoService; +import com.czcb.scfs.api.service.v2.ar.OrderPurchaseService; +import com.czcb.scfs.api.service.v2.ar.ProjectInfoService; +import com.czcb.scfs.api.service.v2.ar.model.*; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +@SpringBootTest +public class ArServiceTest { + @Resource + private ContractInfoService contractInfoService; + @Resource + private ProjectInfoService projectInfoService; + @Resource + private OrderPurchaseService orderPurchaseService; + + + //303305-项目详情查看(农都) + @Test + void arProjectInfoFindOne() { + ArProjectInfoFindOneRequest request = new ArProjectInfoFindOneRequest(); + request.setChannelNo("0000"); + request.setAppNo("10"); + request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); + request.setTransDate("2024-03-20"); + request.setTransTradeTime("2024-01-02 09:11:53"); + ArProjectInfoDTO arProjectInfoDTO = new ArProjectInfoDTO(); + arProjectInfoDTO.setProjectNo("农都项目20251208"); + request.setData(arProjectInfoDTO); + ArProjectInfoFindOneResponse response = projectInfoService.arProjectInfoFindOne(request); + System.out.println(response); + } + + //303306-项目分页查询(农都) + @Test + void arProjectInfoPageQuery() { + ArProjectInfoPageQueryRequest request = new ArProjectInfoPageQueryRequest(); + request.setChannelNo("0000"); + request.setAppNo("10"); + request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); + request.setTransDate("2024-03-20"); + request.setTransTradeTime("2024-01-02 09:11:53"); + ArProjectInfoDTO arProjectInfoDTO = new ArProjectInfoDTO(); + arProjectInfoDTO.setProjectNo("YDD001融资业务"); + request.setData(arProjectInfoDTO); + ArProjectInfoPageQueryResponse response = projectInfoService.arProjectInfoPageQuery(request); + System.out.println(response); + } + + //312105-合同详情查看(农都) + @Test + void arContractInfoFindOne() { + ArContractInfoFindOneRequest request = new ArContractInfoFindOneRequest(); + request.setChannelNo("0000"); + request.setAppNo("10"); + request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); + request.setTransDate("2024-03-20"); + request.setTransTradeTime("2024-01-02 09:11:53"); + ArContractInfoDTO arContractInfoDTO = new ArContractInfoDTO(); + arContractInfoDTO.setContractNo("分包合同20251212001"); + request.setData(arContractInfoDTO); + ArContractInfoFindOneResponse response = contractInfoService.arContractInfoFindOne(request); + System.out.println(response); + } + + //312105-合同详情查看(农都) + @Test + void arContractInfoPageQuery() { + ArContractInfoPageQueryRequest request = new ArContractInfoPageQueryRequest(); + request.setChannelNo("0000"); + request.setAppNo("10"); + request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); + request.setTransDate("2024-03-20"); + request.setTransTradeTime("2024-01-02 09:11:53"); + ArContractInfoDTO arContractInfoDTO = new ArContractInfoDTO(); + arContractInfoDTO.setContractNo("分包合同20251212001"); + request.setData(arContractInfoDTO); + ArContractInfoPageQueryResponse response = contractInfoService.arContractInfoPageQuery(request); + System.out.println(response); + } + + //312107-合同登记(农都) + @Test + void arContractAdd() { + ArContractAddRequest request = new ArContractAddRequest(); + request.setChannelNo("1038"); + request.setAppNo("10"); + request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); + request.setTransDate("2024-03-20"); + request.setTransTradeTime("2024-01-02 09:11:53"); + + request.setProjectNo("489789"); + request.setContractNo("TEST001"); + request.setExpiryDateStart("2025-10-10"); + request.setExpiryDateEnd("2026-10-10"); + request.setContractType("1"); + request.setContractAmount(BigDecimal.ONE); + request.setPartyAName("A"); + request.setPartyAIdNo("A"); + request.setPartyAAccountNo("A"); + request.setPartyAAccountName("A"); + request.setPartyBName("B"); + request.setPartyBIdNo("B"); + request.setPartyBAccountNo("B"); + request.setPartyBAccountName("B"); + request.setPayPropMax(BigDecimal.ZERO); + List fileSaveList = new ArrayList<>(); + ArContractAddRequest.ArContractFileSave fileSave = new ArContractAddRequest.ArContractFileSave(); + fileSave.setFileNo("1"); + fileSaveList.add(fileSave); + request.setFileList(fileSaveList); + + ArContractAddResponse response = contractInfoService.arContractAdd(request); + System.out.println(response); + } + + //312109-合同作废(农都) + @Test + void arContractInvalid() { + ArContractInvalidRequest request = new ArContractInvalidRequest(); + request.setChannelNo("0000"); + request.setAppNo("10"); + request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); + request.setTransDate("2024-03-20"); + request.setTransTradeTime("2024-01-02 09:11:53"); + List invalidContractList = new ArrayList<>(); + ArContractInvalidRequest.InvalidContract invalidContract = new ArContractInvalidRequest.InvalidContract(); + invalidContract.setContractNo("A"); + invalidContractList.add(invalidContract); + request.setContractList(invalidContractList); + ArContractInvalidResponse response = contractInfoService.arContractInvalid(request); + System.out.println(response); + } + + //312205-采购订单详情查看(农都) + @Test + void arOrderPurchaseFindOne() { + ArOrderPurchaseFindOneRequest request = new ArOrderPurchaseFindOneRequest(); + request.setChannelNo("0000"); + request.setAppNo("10"); + request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); + request.setTransDate("2024-03-20"); + request.setTransTradeTime("2024-01-02 09:11:53"); + ArOrderPurchaseDTO arOrderPurchaseDTO = new ArOrderPurchaseDTO(); + arOrderPurchaseDTO.setOrderNo("采购订单20251212002"); + request.setData(arOrderPurchaseDTO); + ArOrderPurchaseFindOneResponse response = orderPurchaseService.arOrderPurchaseFindOne(request); + System.out.println(response); + } + + //312206-采购订单分页查询(农都) + @Test + void arOrderPurchasePageQuery() { + ArOrderPurchasePageQueryRequest request = new ArOrderPurchasePageQueryRequest(); + request.setChannelNo("0000"); + request.setAppNo("10"); + request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); + request.setTransDate("2024-03-20"); + request.setTransTradeTime("2024-01-02 09:11:53"); + ArOrderPurchaseDTO arOrderPurchaseDTO = new ArOrderPurchaseDTO(); +// arOrderPurchaseDTO.setOrderNo("采购订单20251212002"); + request.setData(arOrderPurchaseDTO); + ArOrderPurchasePageQueryResponse response = orderPurchaseService.arOrderPurchasePageQuery(request); + System.out.println(response); + } + + //312207-采购订单登记(农都) + @Test + void arOrderPurchaseAdd() { + ArOrderPurchaseAddRequest request = new ArOrderPurchaseAddRequest(); + request.setChannelNo("0000"); + request.setAppNo("10"); + request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); + request.setTransDate("2024-03-20"); + request.setTransTradeTime("2024-01-02 09:11:53"); + + request.setContractNo("采购订单20251212002"); + request.setPartyAName("A"); + request.setPartyAIdNo("A"); + request.setPartyBName("B"); + request.setPartyBIdNo("B"); + request.setAccountNoA1("A1"); + request.setAccountNoA2("A2"); + request.setAccountName("A"); + request.setOrderNo("no"); + request.setOrderAmount(BigDecimal.ONE); + List goodsList = new ArrayList<>(); + ArOrderPurchaseAddRequest.OrderPurchaseGoods goods = new ArOrderPurchaseAddRequest.OrderPurchaseGoods(); + goods.setGoodsNo("no"); + goods.setGoodsName("name"); + goods.setGoodsQuantity(1); + goods.setGoodsUnit("1"); + goods.setGoodsPrice(BigDecimal.ONE); + goods.setGoodsAmount(BigDecimal.ONE); + goodsList.add(goods); + request.setGoodsList(goodsList); + + ArOrderPurchaseAddResponse response = orderPurchaseService.arOrderPurchaseAdd(request); + System.out.println(response); + } + + //312208-采购订单作废(农都) + @Test + void arOrderPurchaseInvalid() { + ArOrderPurchaseInvalidRequest request = new ArOrderPurchaseInvalidRequest(); + request.setChannelNo("0000"); + request.setAppNo("10"); + request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); + request.setTransDate("2024-03-20"); + request.setTransTradeTime("2024-01-02 09:11:53"); + List invalidOrderPurchaseList = new ArrayList<>(); + ArOrderPurchaseInvalidRequest.InvalidOrderPurchase invalidOrderPurchase = new ArOrderPurchaseInvalidRequest.InvalidOrderPurchase(); + invalidOrderPurchase.setOrderNo("A"); + invalidOrderPurchaseList.add(invalidOrderPurchase); + request.setOrderNoList(invalidOrderPurchaseList); + ArOrderPurchaseInvalidResponse response = orderPurchaseService.arOrderPurchaseInvalid(request); + System.out.println(response); + } +}