From 9830930717f1c7adb446b3b8074ef0e3557f387e Mon Sep 17 00:00:00 2001 From: DaxPay Date: Fri, 20 Dec 2024 18:02:29 +0800 Subject: [PATCH] =?UTF-8?q?style=20=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../allocation/{receiver => }/AliPayAllocReceiverService.java | 3 +-- .../alipay/service/transfer/AliPayTransferService.java | 1 - .../channel/alipay/strategy/AliPayAllocReceiverStrategy.java | 2 +- .../daxpay/service/service/order/pay/PayOrderService.java | 2 +- .../daxpay/service/service/trade/pay/PaySyncService.java | 1 - .../daxpay/service/task/AllocationSyncTaskService.java | 4 ---- 6 files changed, 3 insertions(+), 10 deletions(-) rename daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/allocation/{receiver => }/AliPayAllocReceiverService.java (97%) diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/allocation/receiver/AliPayAllocReceiverService.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/allocation/AliPayAllocReceiverService.java similarity index 97% rename from daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/allocation/receiver/AliPayAllocReceiverService.java rename to daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/allocation/AliPayAllocReceiverService.java index 7f8edcec..cac0905c 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/allocation/receiver/AliPayAllocReceiverService.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/allocation/AliPayAllocReceiverService.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.channel.alipay.service.allocation.receiver; +package org.dromara.daxpay.channel.alipay.service.allocation; import cn.hutool.core.util.StrUtil; import com.alipay.api.AlipayResponse; @@ -88,7 +88,6 @@ public class AliPayAllocReceiverService { AlipayTradeRoyaltyRelationUnbindRequest request = new AlipayTradeRoyaltyRelationUnbindRequest(); request.setBizModel(model); AlipayTradeRoyaltyRelationUnbindResponse response = aliPayConfigService.execute(request); - System.out.println(response); // 如果出现分账方不存在也视为成功 if (Objects.equals(response.getSubCode(), AliPayCode.USER_NOT_EXIST)) { return; diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/transfer/AliPayTransferService.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/transfer/AliPayTransferService.java index ca6def28..e67ab664 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/transfer/AliPayTransferService.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/transfer/AliPayTransferService.java @@ -45,7 +45,6 @@ public class AliPayTransferService { AlipayFundAccountQueryRequest request = new AlipayFundAccountQueryRequest(); request.setBizModel(model); AlipayFundAccountQueryResponse response = aliPayConfigService.execute(request); - System.out.println(response); } /** diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayAllocReceiverStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayAllocReceiverStrategy.java index 94cb3154..dcfa7795 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayAllocReceiverStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayAllocReceiverStrategy.java @@ -3,7 +3,7 @@ package org.dromara.daxpay.channel.alipay.strategy; import cn.bootx.platform.core.exception.ValidationFailedException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.daxpay.channel.alipay.service.allocation.receiver.AliPayAllocReceiverService; +import org.dromara.daxpay.channel.alipay.service.allocation.AliPayAllocReceiverService; import org.dromara.daxpay.core.enums.AllocReceiverTypeEnum; import org.dromara.daxpay.core.enums.ChannelEnum; import org.dromara.daxpay.service.strategy.AbsAllocReceiverStrategy; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/order/pay/PayOrderService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/order/pay/PayOrderService.java index c0baee63..b0310aeb 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/order/pay/PayOrderService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/order/pay/PayOrderService.java @@ -85,7 +85,7 @@ public class PayOrderService { /** * 自动分账 */ - public void autoAllocation(Long id){ + public void autoAllocation(@NotNull(message = "支付订单id不能为空") Long id){ try { PayOrder payOrder = payOrderManager.findById(id).orElseThrow(() -> new TradeNotExistException("支付订单不存在")); // 是否开启自动完结 diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/pay/PaySyncService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/pay/PaySyncService.java index 37628469..33827a86 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/pay/PaySyncService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/trade/pay/PaySyncService.java @@ -72,7 +72,6 @@ public class PaySyncService { if (Objects.equals(payOrder.getStatus(), WAIT.getCode())){ throw new TradeStatusErrorException("订单未开始支付, 请重新确认支付状态"); } - // 加锁 LockInfo lock = lockTemplate.lock("sync:pay" + payOrder.getId(),10000,200); if (Objects.isNull(lock)){ diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/task/AllocationSyncTaskService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/task/AllocationSyncTaskService.java index c30792e2..6cb08989 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/task/AllocationSyncTaskService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/task/AllocationSyncTaskService.java @@ -14,8 +14,4 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class AllocationSyncTaskService { - /** - * 分账同步 - */ - }