diff --git a/_doc/Task.md b/_doc/Task.md index ad2333b7d..eb6b5d2be 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 49547766c..fdea1e66f 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 e1662c18e..faa98e5e6 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 4ff28398f..9b1398087 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 6d9f9a1ca..2c444eacd 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 34b9fbdbf..79f47871a 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 dcfa7795f..746a45d65 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 9195ddb0e..f424276fa 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 03442a3f1..f960b62c9 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 66c9ca9e5..e239aa90a 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 f467c0be1..c961fa763 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 32b0bed27..04469df5b 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 2b04f8fa7..467ef4216 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 4466c6971..b28b7b0f5 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 8e0171fd5..d0c8918e6 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 2dc190aab..67044e718 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 525ba9882..8765f0742 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 724645a81..e2270b252 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 04933d9ee..f6759b2e9 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"), /** 云闪付 */