From d67336257745f0830639bf4fc522427ee426b7db Mon Sep 17 00:00:00 2001 From: bootx Date: Sun, 2 Jun 2024 01:54:11 +0800 Subject: [PATCH] =?UTF-8?q?perf=20=E5=88=86=E8=B4=A6=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../single/sdk/param/allocation/AllocationParam.java | 2 +- .../single/sdk/allocation/AllocationReceiverTest.java | 6 +++--- .../daxpay/single/sdk/allocation/AllocationTest.java | 10 +++++----- .../cn/daxpay/single/sdk/payment/PayOrderSyncTest.java | 2 +- .../cn/daxpay/single/sdk/payment/PayOrderTest.java | 2 +- .../daxpay/single/sdk/payment/RefundOrderSyncTest.java | 2 +- .../cn/daxpay/single/sdk/payment/RefundOrderTest.java | 2 +- .../cn/daxpay/single/sdk/query/QueryPayOrderTest.java | 2 +- .../daxpay/single/sdk/query/QueryRefundOrderTest.java | 2 +- .../param/payment/allocation/AllocationParam.java | 4 ++-- .../single/result/allocation/AllocationResult.java | 6 +++++- .../gateway/controller/UniAllocationController.java | 6 +++--- 13 files changed, 26 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 311c400f3..f920f6cda 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ public class PayOrderTest { DaxPayResult execute = DaxPayKit.execute(param); System.out.println(JSONUtil.toJsonStr(execute)); - System.out.println(JSONUtil.toJsonStr(execute.getData())); + } } ``` diff --git a/daxpay-single-sdk/src/main/java/cn/daxpay/single/sdk/param/allocation/AllocationParam.java b/daxpay-single-sdk/src/main/java/cn/daxpay/single/sdk/param/allocation/AllocationParam.java index 9ee736f2b..936294a0e 100644 --- a/daxpay-single-sdk/src/main/java/cn/daxpay/single/sdk/param/allocation/AllocationParam.java +++ b/daxpay-single-sdk/src/main/java/cn/daxpay/single/sdk/param/allocation/AllocationParam.java @@ -54,7 +54,7 @@ public class AllocationParam extends DaxPayRequest { */ @Override public String path() { - return "/unipay/allocation/open"; + return "/unipay/allocation/start"; } /** diff --git a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/allocation/AllocationReceiverTest.java b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/allocation/AllocationReceiverTest.java index 12b1ed3c3..aeceba624 100644 --- a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/allocation/AllocationReceiverTest.java +++ b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/allocation/AllocationReceiverTest.java @@ -50,7 +50,7 @@ public class AllocationReceiverTest { param.setReceiverAccount("123456"); DaxPayResult execute = DaxPayKit.execute(param); System.out.println(JSONUtil.toJsonStr(execute)); - System.out.println(JSONUtil.toJsonStr(execute.getData())); + } /** @@ -63,7 +63,7 @@ public class AllocationReceiverTest { param.setReceiverNo("123"); DaxPayResult execute = DaxPayKit.execute(param); System.out.println(JSONUtil.toJsonStr(execute)); - System.out.println(JSONUtil.toJsonStr(execute.getData())); + } /** @@ -77,7 +77,7 @@ public class AllocationReceiverTest { DaxPayResult execute = DaxPayKit.execute(param); System.out.println(JSONUtil.toJsonStr(execute)); - System.out.println(JSONUtil.toJsonStr(execute.getData())); + } diff --git a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/allocation/AllocationTest.java b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/allocation/AllocationTest.java index e51b65ba5..4e9c6fdd3 100644 --- a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/allocation/AllocationTest.java +++ b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/allocation/AllocationTest.java @@ -59,7 +59,7 @@ public class AllocationTest { DaxPayResult execute = DaxPayKit.execute(param); System.out.println(JSONUtil.toJsonStr(execute)); - System.out.println(JSONUtil.toJsonStr(execute.getData())); + } /** @@ -83,7 +83,7 @@ public class AllocationTest { DaxPayResult execute = DaxPayKit.execute(param); System.out.println(JSONUtil.toJsonStr(execute)); - System.out.println(JSONUtil.toJsonStr(execute.getData())); + } /** @@ -95,7 +95,7 @@ public class AllocationTest { AllocationParam param = new AllocationParam(); param.setBizAllocationNo("A"+ RandomUtil.randomNumbers(5)); param.setAttach("88899"); - param.setBizOrderNo("SDK_1717233422418"); + param.setBizOrderNo("SDK_1717264053245"); param.setDescription("测试分账"); param.setClientIp("127.0.0.1"); @@ -130,10 +130,10 @@ public class AllocationTest { AllocationParam param = new AllocationParam(); param.setBizAllocationNo("A"+ RandomUtil.randomNumbers(5)); param.setAttach("88899"); - param.setOrderNo("DEVP24060123574963000003"); + param.setOrderNo("DEVP24060201473363000001"); AllocReceiverParam allocReceiverParam = new AllocReceiverParam(); allocReceiverParam.setReceiverNo("123"); - allocReceiverParam.setAmount(6000); + allocReceiverParam.setAmount(6500); param.setReceivers(Collections.singletonList(allocReceiverParam)); param.setDescription("测试分账"); param.setClientIp("127.0.0.1"); diff --git a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/PayOrderSyncTest.java b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/PayOrderSyncTest.java index 00a4117f6..8136b0e10 100644 --- a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/PayOrderSyncTest.java +++ b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/PayOrderSyncTest.java @@ -34,7 +34,7 @@ public class PayOrderSyncTest { param.setBizOrderNo("SDK_1715341621498"); DaxPayResult execute = DaxPayKit.execute(param); System.out.println(JSONUtil.toJsonStr(execute)); - System.out.println(JSONUtil.toJsonStr(execute.getData())); + } } diff --git a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/PayOrderTest.java b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/PayOrderTest.java index 07c128cb6..2f3f9c793 100644 --- a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/PayOrderTest.java +++ b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/PayOrderTest.java @@ -51,6 +51,6 @@ public class PayOrderTest { DaxPayResult execute = DaxPayKit.execute(param); System.out.println(JSONUtil.toJsonStr(execute)); - System.out.println(JSONUtil.toJsonStr(execute.getData())); + } } diff --git a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/RefundOrderSyncTest.java b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/RefundOrderSyncTest.java index 32d929570..cd4a16bb9 100644 --- a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/RefundOrderSyncTest.java +++ b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/RefundOrderSyncTest.java @@ -36,7 +36,7 @@ public class RefundOrderSyncTest { param.setClientIp("127.0.0.1"); DaxPayResult execute = DaxPayKit.execute(param); System.out.println(JSONUtil.toJsonStr(execute)); - System.out.println(JSONUtil.toJsonStr(execute.getData())); + } } diff --git a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/RefundOrderTest.java b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/RefundOrderTest.java index f3c62f473..cf5b2797e 100644 --- a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/RefundOrderTest.java +++ b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/payment/RefundOrderTest.java @@ -47,7 +47,7 @@ public class RefundOrderTest { DaxPayResult execute = DaxPayKit.execute(param); System.out.println(JSONUtil.toJsonStr(execute)); - System.out.println(JSONUtil.toJsonStr(execute.getData())); + System.out.println(PaySignUtil.verifyHmacSha256Sign(execute.getData(), "123456", execute.getData().getSign())); } diff --git a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/query/QueryPayOrderTest.java b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/query/QueryPayOrderTest.java index 33531e4ae..bdf6bc67c 100644 --- a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/query/QueryPayOrderTest.java +++ b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/query/QueryPayOrderTest.java @@ -37,6 +37,6 @@ public class QueryPayOrderTest { DaxPayResult execute = DaxPayKit.execute(param); System.out.println(JSONUtil.toJsonStr(execute)); - System.out.println(JSONUtil.toJsonStr(execute.getData())); + } } diff --git a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/query/QueryRefundOrderTest.java b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/query/QueryRefundOrderTest.java index 04d10ab94..edccae95c 100644 --- a/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/query/QueryRefundOrderTest.java +++ b/daxpay-single-sdk/src/test/java/cn/daxpay/single/sdk/query/QueryRefundOrderTest.java @@ -37,6 +37,6 @@ public class QueryRefundOrderTest { DaxPayResult execute = DaxPayKit.execute(param); System.out.println(JSONUtil.toJsonStr(execute)); - System.out.println(JSONUtil.toJsonStr(execute.getData())); + } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/param/payment/allocation/AllocationParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/param/payment/allocation/AllocationParam.java index d24544ef7..1ffe9f730 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/param/payment/allocation/AllocationParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/param/payment/allocation/AllocationParam.java @@ -28,8 +28,8 @@ public class AllocationParam extends PaymentCommonParam { @Schema(description = "支付订单号") private String orderNo; - /** 商户订单号 */ - @Schema(description = "商户订单号") + /** 商户支付订单号 */ + @Schema(description = "商户支付订单号") private String bizOrderNo; /** 分账描述 */ diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/result/allocation/AllocationResult.java b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/result/allocation/AllocationResult.java index eda3db6eb..ca0444cca 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/result/allocation/AllocationResult.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/daxpay/single/result/allocation/AllocationResult.java @@ -1,5 +1,6 @@ package cn.daxpay.single.result.allocation; +import cn.daxpay.single.code.AllocOrderStatusEnum; import cn.daxpay.single.result.PaymentCommonResult; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -25,7 +26,10 @@ public class AllocationResult extends PaymentCommonResult { @Schema(description = "商户分账订单号") private String bizAllocationNo; - /** 分账状态 */ + /** + * 分账状态 + * @see AllocOrderStatusEnum + */ @Schema(description = "分账状态") private String status; } diff --git a/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/UniAllocationController.java b/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/UniAllocationController.java index f779d9c69..eb66788c5 100644 --- a/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/UniAllocationController.java +++ b/daxpay-single/daxpay-single-gateway/src/main/java/cn/daxpay/single/gateway/controller/UniAllocationController.java @@ -41,9 +41,9 @@ public class UniAllocationController { @PaymentSign @InitPaymentContext(PaymentApiCode.ALLOCATION) - @Operation(summary = "触发分账") - @PostMapping("/open") - public DaxResult open(@RequestBody AllocationParam param){ + @Operation(summary = "发起分账接口") + @PostMapping("/start") + public DaxResult start(@RequestBody AllocationParam param){ return DaxRes.ok(allocationService.allocation(param)); }