diff --git a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/PayClientFactory.java b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/PayClientFactory.java index ec22796..57a1093 100644 --- a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/PayClientFactory.java +++ b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/PayClientFactory.java @@ -25,8 +25,7 @@ public interface PayClientFactory { * @param config 支付配置 * @return 支付客户端 */ - PayClient createOrUpdatePayClient(Long channelId, String channelCode, - Config config); + PayClient createOrUpdatePayClient(Long channelId, String channelCode, Config config); /** * 注册支付客户端 Class,用于模块中实现的 PayClient diff --git a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/impl/NonePayClientConfig.java b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/impl/NonePayClientConfig.java deleted file mode 100644 index 6396db0..0000000 --- a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/client/impl/NonePayClientConfig.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.tashow.cloud.sdk.payment.client.impl; - -import com.tashow.cloud.sdk.payment.client.PayClientConfig; -import jakarta.validation.Validator; -import lombok.Data; - -/** - * 无需任何配置 PayClientConfig 实现类 - * - * @author jason - */ -@Data -public class NonePayClientConfig implements PayClientConfig { - - /** - * 配置名称 - *

- * 如果不加任何属性,JsonUtils.parseObject2 解析会报错,所以暂时加个名称 - */ - private String name; - - public NonePayClientConfig(){ - this.name = "none-config"; - } - - @Override - public void validate(Validator validator) { - // 无任何配置不需要校验 - } -} diff --git a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/enums/channel/PayChannelEnum.java b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/enums/channel/PayChannelEnum.java index 4b6dd75..efb0eff 100644 --- a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/enums/channel/PayChannelEnum.java +++ b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/enums/channel/PayChannelEnum.java @@ -2,7 +2,6 @@ package com.tashow.cloud.sdk.payment.enums.channel; import cn.hutool.core.util.ArrayUtil; import com.tashow.cloud.sdk.payment.client.PayClientConfig; -import com.tashow.cloud.sdk.payment.client.impl.NonePayClientConfig; import com.tashow.cloud.sdk.payment.client.impl.alipay.AlipayPayClientConfig; import com.tashow.cloud.sdk.payment.client.impl.weixin.WxPayClientConfig; import lombok.AllArgsConstructor; @@ -29,9 +28,7 @@ public enum PayChannelEnum { ALIPAY_APP("alipay_app", "支付宝App 支付", AlipayPayClientConfig.class), ALIPAY_QR("alipay_qr", "支付宝扫码支付", AlipayPayClientConfig.class), ALIPAY_BAR("alipay_bar", "支付宝条码支付", AlipayPayClientConfig.class), - MOCK("mock", "模拟支付", NonePayClientConfig.class), - - WALLET("wallet", "钱包支付", NonePayClientConfig.class); + ; /** * 编码