From 861f27ff0ccfbd566eaf9ae27ef21abcbc0899ed Mon Sep 17 00:00:00 2001 From: bootx Date: Fri, 20 Dec 2024 23:20:52 +0800 Subject: [PATCH] =?UTF-8?q?refactor(alipay):=20=E5=B0=86=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=9D=E9=80=9A=E9=81=93=E6=A0=87=E8=AF=86=E4=BB=8E=20ALI=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=20ALIPAY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 1 + .../daxpay/channel/alipay/entity/config/AliPayConfig.java | 2 +- .../channel/alipay/service/callback/AliPayCallbackService.java | 2 +- .../channel/alipay/service/config/AliPayConfigService.java | 2 +- .../alipay/service/notice/AliPayTransferNoticeService.java | 2 +- .../daxpay/channel/alipay/strategy/AliAllocationStrategy.java | 2 +- .../channel/alipay/strategy/AliPayAllocReceiverStrategy.java | 2 +- .../daxpay/channel/alipay/strategy/AliPayAuthStrategy.java | 2 +- .../channel/alipay/strategy/AliPayCashierCodeStrategy.java | 2 +- .../daxpay/channel/alipay/strategy/AliPayCheckoutStrategy.java | 2 +- .../daxpay/channel/alipay/strategy/AliPayCloseStrategy.java | 2 +- .../daxpay/channel/alipay/strategy/AliPayReconcileStrategy.java | 2 +- .../daxpay/channel/alipay/strategy/AliPayRefundStrategy.java | 2 +- .../dromara/daxpay/channel/alipay/strategy/AliPayStrategy.java | 2 +- .../daxpay/channel/alipay/strategy/AliPaySyncOrderStrategy.java | 2 +- .../channel/alipay/strategy/AliPaySyncRefundStrategy.java | 2 +- .../channel/alipay/strategy/AliPaySyncTransferStrategy.java | 2 +- .../daxpay/channel/alipay/strategy/AliPayTransferStrategy.java | 2 +- .../main/java/org/dromara/daxpay/core/enums/ChannelEnum.java | 2 +- 19 files changed, 19 insertions(+), 18 deletions(-) diff --git a/_doc/Task.md b/_doc/Task.md index ad2333b7..eb6b5d2b 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -11,6 +11,7 @@ - [ ] 服务商支付支持 - [ ] 支付宝 - [ ] 微信 +- [ ] 微信增加公钥证书方式 ## 3.0.0.bate3: 分账 - [x] SDK接口 - [x] 分账相关接口: 分账,完结,同步,查询 diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/entity/config/AliPayConfig.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/entity/config/AliPayConfig.java index 49547766..fdea1e66 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/entity/config/AliPayConfig.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/entity/config/AliPayConfig.java @@ -77,7 +77,7 @@ public class AliPayConfig implements ToResult { channelConfig.setOutAppId(this.getAliAppId()); channelConfig.setAppId(this.getAppId()); channelConfig.setEnable(this.getEnable()); - channelConfig.setChannel(ChannelEnum.ALI.getCode()); + channelConfig.setChannel(ChannelEnum.ALIPAY.getCode()); AliPayConfig copy = AliPayConfigConvert.CONVERT.copy(this); // 清空不需要序列化的字段 copy.setId(null).setAppId(null).setEnable(null).setAliAppId(null).setAppId(null); diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/callback/AliPayCallbackService.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/callback/AliPayCallbackService.java index e1662c18..faa98e5e 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/callback/AliPayCallbackService.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/callback/AliPayCallbackService.java @@ -86,7 +86,7 @@ public class AliPayCallbackService { CallbackLocal callback = PaymentContextLocal.get().getCallbackInfo(); callback.setCallbackData(callbackParam); // 通道和回调类型 - callback.setChannel(ChannelEnum.ALI.getCode()); + callback.setChannel(ChannelEnum.ALIPAY.getCode()); String refundFee = callbackParam.get(ResponseParams.REFUND_FEE); // 如果有退款金额，说明是退款回调 if (StrUtil.isNotBlank(refundFee)){ diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/config/AliPayConfigService.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/config/AliPayConfigService.java index 4ff28398..9b139808 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/config/AliPayConfigService.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/config/AliPayConfigService.java @@ -119,7 +119,7 @@ public class AliPayConfigService { */ public AliPayConfig getAliPayConfig(){ MchAppLocal mchAppInfo = PaymentContextLocal.get().getMchAppInfo(); - ChannelConfig channelConfig = channelConfigCacheService.get(mchAppInfo.getAppId(), ChannelEnum.ALI.getCode()); + ChannelConfig channelConfig = channelConfigCacheService.get(mchAppInfo.getAppId(), ChannelEnum.ALIPAY.getCode()); return AliPayConfig.convertConfig(channelConfig); } diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/notice/AliPayTransferNoticeService.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/notice/AliPayTransferNoticeService.java index 6d9f9a1c..2c444eac 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/notice/AliPayTransferNoticeService.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/notice/AliPayTransferNoticeService.java @@ -51,7 +51,7 @@ public class AliPayTransferNoticeService { public String callback(Map map) { CallbackLocal callbackInfo = PaymentContextLocal.get().getCallbackInfo(); callbackInfo.setRawData(JsonUtil.toJsonStr(map)) - .setChannel(ChannelEnum.ALI.getCode()) + .setChannel(ChannelEnum.ALIPAY.getCode()) .setCallbackType(TradeTypeEnum.TRANSFER); // 通过 biz_content 获取值 diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliAllocationStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliAllocationStrategy.java index 34b9fbdb..79f47871 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliAllocationStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliAllocationStrategy.java @@ -26,7 +26,7 @@ public class AliAllocationStrategy extends AbsAllocationStrategy { */ @Override public String getChannel() { - return ChannelEnum.ALI.getCode(); + return ChannelEnum.ALIPAY.getCode(); } /** 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 dcfa7795..746a45d6 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 @@ -32,7 +32,7 @@ public class AliPayAllocReceiverStrategy extends AbsAllocReceiverStrategy { */ @Override public String getChannel() { - return ChannelEnum.ALI.getCode(); + return ChannelEnum.ALIPAY.getCode(); } @Override diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayAuthStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayAuthStrategy.java index 9195ddb0..f424276f 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayAuthStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayAuthStrategy.java @@ -29,7 +29,7 @@ public class AliPayAuthStrategy extends AbsChannelAuthStrategy { */ @Override public String getChannel() { - return ChannelEnum.ALI.getCode(); + return ChannelEnum.ALIPAY.getCode(); } /** diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCashierCodeStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCashierCodeStrategy.java index 03442a3f..f960b62c 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCashierCodeStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCashierCodeStrategy.java @@ -21,6 +21,6 @@ public class AliPayCashierCodeStrategy extends AbsCashierCodeStrategy { */ @Override public String getChannel() { - return ChannelEnum.ALI.getCode(); + return ChannelEnum.ALIPAY.getCode(); } } diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCheckoutStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCheckoutStrategy.java index 66c9ca9e..e239aa90 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCheckoutStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCheckoutStrategy.java @@ -24,7 +24,7 @@ public class AliPayCheckoutStrategy extends AbsCheckoutStrategy { */ @Override public String getChannel() { - return ChannelEnum.ALI.getCode(); + return ChannelEnum.ALIPAY.getCode(); } /** diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCloseStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCloseStrategy.java index f467c0be..c961fa76 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCloseStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCloseStrategy.java @@ -27,7 +27,7 @@ public class AliPayCloseStrategy extends AbsPayCloseStrategy { @Override public String getChannel() { - return ChannelEnum.ALI.getCode(); + return ChannelEnum.ALIPAY.getCode(); } /** diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayReconcileStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayReconcileStrategy.java index 32b0bed2..04469df5 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayReconcileStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayReconcileStrategy.java @@ -37,7 +37,7 @@ public class AliPayReconcileStrategy extends AbsReconcileStrategy { */ @Override public String getChannel() { - return ChannelEnum.ALI.getCode(); + return ChannelEnum.ALIPAY.getCode(); } /** diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayRefundStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayRefundStrategy.java index 2b04f8fa..467ef421 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayRefundStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayRefundStrategy.java @@ -28,7 +28,7 @@ public class AliPayRefundStrategy extends AbsRefundStrategy { */ @Override public String getChannel() { - return ChannelEnum.ALI.getCode(); + return ChannelEnum.ALIPAY.getCode(); } diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayStrategy.java index 4466c697..b28b7b0f 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayStrategy.java @@ -31,7 +31,7 @@ public class AliPayStrategy extends AbsPayStrategy { @Override public String getChannel() { - return ChannelEnum.ALI.getCode(); + return ChannelEnum.ALIPAY.getCode(); } /** diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPaySyncOrderStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPaySyncOrderStrategy.java index 8e0171fd..d0c8918e 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPaySyncOrderStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPaySyncOrderStrategy.java @@ -27,7 +27,7 @@ public class AliPaySyncOrderStrategy extends AbsSyncPayOrderStrategy { */ @Override public String getChannel() { - return ChannelEnum.ALI.getCode(); + return ChannelEnum.ALIPAY.getCode(); } /** diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPaySyncRefundStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPaySyncRefundStrategy.java index 2dc190aa..67044e71 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPaySyncRefundStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPaySyncRefundStrategy.java @@ -33,7 +33,7 @@ public class AliPaySyncRefundStrategy extends AbsSyncRefundOrderStrategy { */ @Override public String getChannel() { - return ChannelEnum.ALI.getCode(); + return ChannelEnum.ALIPAY.getCode(); } diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPaySyncTransferStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPaySyncTransferStrategy.java index 525ba988..8765f074 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPaySyncTransferStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPaySyncTransferStrategy.java @@ -29,7 +29,7 @@ public class AliPaySyncTransferStrategy extends AbsSyncTransferOrderStrategy { */ @Override public String getChannel() { - return ChannelEnum.ALI.getCode(); + return ChannelEnum.ALIPAY.getCode(); } /** diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayTransferStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayTransferStrategy.java index 724645a8..e2270b25 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayTransferStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayTransferStrategy.java @@ -34,7 +34,7 @@ public class AliPayTransferStrategy extends AbsTransferStrategy { */ @Override public String getChannel() { - return ChannelEnum.ALI.getCode(); + return ChannelEnum.ALIPAY.getCode(); } @Override diff --git a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/enums/ChannelEnum.java b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/enums/ChannelEnum.java index 04933d9e..f6759b2e 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/enums/ChannelEnum.java +++ b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/enums/ChannelEnum.java @@ -15,7 +15,7 @@ import lombok.RequiredArgsConstructor; public enum ChannelEnum { /** 支付宝 - 直连商户 */ - ALI("ali_pay"), + ALIPAY("ali_pay"), /** 微信支付 */ WECHAT("wechat_pay"), /** 云闪付 */