perf 分账相关字段调整

2025-10-14 13:50:25 +00:00 · 2024-06-02 01:54:11 +08:00
parent 990ce7d361
commit d673362577
13 changed files with 26 additions and 22 deletions
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ public class PayOrderTest {

        DaxPayResult<PayModel> execute = DaxPayKit.execute(param);
        System.out.println(JSONUtil.toJsonStr(execute));
-        System.out.println(JSONUtil.toJsonStr(execute.getData()));
+        
    }
 }
 ```
--- 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<AllocationModel> {
     */
    @Override
    public String path() {
-        return "/unipay/allocation/open";
+        return "/unipay/allocation/start";
    }

    /**
--- 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<AllocReceiverAddModel> 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<AllocReceiverRemoveModel> 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<AllocReceiversModel> execute = DaxPayKit.execute(param);

        System.out.println(JSONUtil.toJsonStr(execute));
-        System.out.println(JSONUtil.toJsonStr(execute.getData()));
+        
    }


--- 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<PayModel> 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<PayModel> 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");
--- 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<PaySyncModel> execute = DaxPayKit.execute(param);
        System.out.println(JSONUtil.toJsonStr(execute));
-        System.out.println(JSONUtil.toJsonStr(execute.getData()));
+        
    }

 }
--- 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<PayModel> execute = DaxPayKit.execute(param);
        System.out.println(JSONUtil.toJsonStr(execute));
-        System.out.println(JSONUtil.toJsonStr(execute.getData()));
+        
    }
 }
--- 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<RefundSyncModel> execute = DaxPayKit.execute(param);
        System.out.println(JSONUtil.toJsonStr(execute));
-        System.out.println(JSONUtil.toJsonStr(execute.getData()));
+        
    }

 }
--- 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<RefundModel> 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()));
    }

--- 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<PayOrderModel> execute = DaxPayKit.execute(param);
        System.out.println(JSONUtil.toJsonStr(execute));
-        System.out.println(JSONUtil.toJsonStr(execute.getData()));
+        
    }
 }
--- 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<RefundOrderModel> execute = DaxPayKit.execute(param);
        System.out.println(JSONUtil.toJsonStr(execute));
-        System.out.println(JSONUtil.toJsonStr(execute.getData()));
+        
    }
 }
--- 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;

    /** 分账描述 */
--- 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;
 }
--- 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<AllocationResult> open(@RequestBody AllocationParam param){
+    @Operation(summary = "发起分账接口")
+    @PostMapping("/start")
+    public DaxResult<AllocationResult> start(@RequestBody AllocationParam param){
        return DaxRes.ok(allocationService.allocation(param));
    }