From 1deee49edbb6fb88c73c6dd56deefb4cc93188c3 Mon Sep 17 00:00:00 2001 From: bootx Date: Sun, 14 Apr 2024 12:27:23 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=BC=94=E7=A4=BA=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=86=E8=B4=A6,=20=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=88=86=E8=B4=A6=E7=AD=BE=E5=90=8D=E9=94=99=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/bootx/platform/daxpay/demo/domain/AggregatePayInfo.java | 3 +++ .../platform/daxpay/demo/param/AggregateSimplePayParam.java | 3 +++ .../platform/daxpay/demo/param/CashierSimplePayParam.java | 3 +++ .../bootx/platform/daxpay/demo/service/AggregateService.java | 2 ++ .../cn/bootx/platform/daxpay/demo/service/CashierService.java | 1 + .../channel/wechat/service/WeChatPayAllocationService.java | 2 +- 6 files changed, 13 insertions(+), 1 deletion(-) diff --git a/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/domain/AggregatePayInfo.java b/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/domain/AggregatePayInfo.java index bd037e25c..fa9fdb180 100644 --- a/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/domain/AggregatePayInfo.java +++ b/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/domain/AggregatePayInfo.java @@ -21,6 +21,9 @@ public class AggregatePayInfo { @Schema(description = "订单业务号") private String businessNo; + @Schema(description = "是否分账") + private boolean allocation; + /** 支付金额 */ @Schema(description = "支付金额") private Integer amount; diff --git a/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/param/AggregateSimplePayParam.java b/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/param/AggregateSimplePayParam.java index 4192e75f5..d18cf3a43 100644 --- a/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/param/AggregateSimplePayParam.java +++ b/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/param/AggregateSimplePayParam.java @@ -20,6 +20,9 @@ public class AggregateSimplePayParam { @NotNull private String businessNo; + @Schema(description = "是否分账") + private boolean allocation; + @Schema(description = "标题") @NotNull private String title; diff --git a/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/param/CashierSimplePayParam.java b/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/param/CashierSimplePayParam.java index a45b4cd11..cbd554f99 100644 --- a/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/param/CashierSimplePayParam.java +++ b/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/param/CashierSimplePayParam.java @@ -22,6 +22,9 @@ public class CashierSimplePayParam { @NotNull private String businessNo; + @Schema(description = "是否分账") + private boolean allocation; + @Schema(description = "标题") @NotNull private String title; diff --git a/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/service/AggregateService.java b/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/service/AggregateService.java index bc4061805..e89d2c1f5 100644 --- a/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/service/AggregateService.java +++ b/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/service/AggregateService.java @@ -58,6 +58,7 @@ public class AggregateService { AggregatePayInfo aggregatePayInfo = new AggregatePayInfo() .setTitle(param.getTitle()) .setBusinessNo(param.getBusinessNo()) + .setAllocation(param.isAllocation()) .setAmount(amount); String code = IdUtil.getSnowflakeNextIdStr(); String serverUrl = daxPayDemoProperties.getServerUrl(); @@ -218,6 +219,7 @@ public class AggregateService { SimplePayParam simplePayParam = new SimplePayParam(); simplePayParam.setBusinessNo(param.getBusinessNo()); + simplePayParam.setAllocation(param.isAllocation()); simplePayParam.setTitle(param.getTitle()); simplePayParam.setAmount(amount); simplePayParam.setChannel(payChannel.getCode()); diff --git a/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/service/CashierService.java b/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/service/CashierService.java index 7bed544c3..9d2e837e6 100644 --- a/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/service/CashierService.java +++ b/daxpay-single-demo/src/main/java/cn/bootx/platform/daxpay/demo/service/CashierService.java @@ -52,6 +52,7 @@ public class CashierService { // 将参数转换为简单支付参数 SimplePayParam simplePayParam = new SimplePayParam(); simplePayParam.setBusinessNo(param.getBusinessNo()); + simplePayParam.setAllocation(param.isAllocation()); int amount = param.getAmount() .multiply(BigDecimal.valueOf(100)) .intValue(); diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayAllocationService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayAllocationService.java index 6a63defd9..76fd837db 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayAllocationService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayAllocationService.java @@ -96,9 +96,9 @@ public class WeChatPayAllocationService { * 查询分账状态 */ public void queryStatus(AllocationOrder allocationOrder, WeChatPayConfig config){ + // 不要传输AppId参数, 否则会失败 Map params = ProfitSharingModel.builder() .mch_id(config.getWxMchId()) - .appid(config.getWxAppId()) .nonce_str(WxPayKit.generateStr()) .transaction_id(allocationOrder.getGatewayPayOrderNo()) .out_order_no(allocationOrder.getOrderNo())