Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product

yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientFactory.java

@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.framework.pay.core.client;
 
-import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient;
+import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
 
 /**
  * 支付客户端的工厂接口
@@ -21,8 +21,17 @@ public interface PayClientFactory {
      * 创建支付客户端
      *
      * @param channelId 渠道编号
-     * @param client 支付客户端
-     * @param <Config> 支付配置
+     * @param channelCode 渠道编码
+     * @param config 支付配置
      */
-    <Config extends PayClientConfig> void addOrUpdatePayClient(Long channelId, AbstractPayClient<Config> client);
+    <Config extends PayClientConfig> void createOrUpdatePayClient(Long channelId, String channelCode,
+                                                                  Config config);
+
+    /**
+     * 注册支付客户端 Class, 用于模块中实现的 PayClient
+     *
+     * @param payChannelEnum 支付渠道的编码的枚举
+     * @param payClientClass 支付客户端 class
+     */
+    void registerPayClientClass(PayChannelEnum payChannelEnum, Class<?> payClientClass);
 }

yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/AbstractPayClient.java

@@ -9,7 +9,6 @@ import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDT
 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO;
 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
 import cn.iocoder.yudao.framework.pay.core.client.exception.PayException;
-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;
@@ -36,7 +35,6 @@ public abstract class AbstractPayClient<Config extends PayClientConfig> implemen
     /**
      * 支付配置
      */
-    @Getter
     protected Config config;
 
     public AbstractPayClient(Long channelId, String channelCode, Config config) {

yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImpl.java

@@ -1,13 +1,22 @@
 package cn.iocoder.yudao.framework.pay.core.client.impl;
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ReflectUtil;
 import cn.iocoder.yudao.framework.pay.core.client.PayClient;
 import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig;
 import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
+import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.*;
+import cn.iocoder.yudao.framework.pay.core.client.impl.mock.MockPayClient;
+import cn.iocoder.yudao.framework.pay.core.client.impl.weixin.*;
+import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import static cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum.*;
+
 /**
  * 支付客户端的工厂实现类
  *
@@ -22,6 +31,29 @@ public class PayClientFactoryImpl implements PayClientFactory {
      */
     private final ConcurrentMap<Long, AbstractPayClient<?>> clients = new ConcurrentHashMap<>();
 
+    /**
+     * 支付客户端 Class Map
+     * key: 支付渠道的编码的枚举
+     */
+    private final Map<PayChannelEnum, Class<?>>clientClass = new ConcurrentHashMap<>(16);
+
+    public PayClientFactoryImpl() {
+        // 微信支付客户端
+        clientClass.put(WX_PUB, WxPubPayClient.class);
+        clientClass.put(WX_LITE, WxLitePayClient.class);
+        clientClass.put(WX_APP, WxAppPayClient.class);
+        clientClass.put(WX_BAR, WxBarPayClient.class);
+        clientClass.put(WX_NATIVE, WxNativePayClient.class);
+        // 支付包支付客户端
+        clientClass.put(ALIPAY_WAP, AlipayWapPayClient.class);
+        clientClass.put(ALIPAY_QR, AlipayQrPayClient.class);
+        clientClass.put(ALIPAY_APP, AlipayAppPayClient.class);
+        clientClass.put(ALIPAY_PC, AlipayPcPayClient.class);
+        clientClass.put(ALIPAY_BAR, AlipayBarPayClient.class);
+        // Mock 支付客户端
+        clientClass.put(MOCK, MockPayClient.class);
+    }
+
     @Override
     public PayClient getPayClient(Long channelId) {
         AbstractPayClient<?> client = clients.get(channelId);
@@ -33,12 +65,31 @@ public class PayClientFactoryImpl implements PayClientFactory {
 
     @Override
     @SuppressWarnings("unchecked")
-    public <Config extends PayClientConfig> void addOrUpdatePayClient(Long channelId, AbstractPayClient<Config> client) {
-        AbstractPayClient<Config> prePayClient = (AbstractPayClient<Config>) clients.putIfAbsent(channelId, client);
-        if (prePayClient == null) {
+    public <Config extends PayClientConfig> void createOrUpdatePayClient(Long channelId, String channelCode,
+                                                                         Config config) {
+        AbstractPayClient<Config> client = (AbstractPayClient<Config>) clients.get(channelId);
+        if (client == null) {
+            client = this.createPayClient(channelId, channelCode, config);
             client.init();
+            clients.put(client.getId(), client);
         } else {
-            prePayClient.refresh(client.getConfig());
+            client.refresh(config);
         }
     }
+
+    @Override
+    public void registerPayClientClass(PayChannelEnum payChannelEnum, Class<?> payClientClass) {
+        clientClass.put(payChannelEnum, payClientClass);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <Config extends PayClientConfig> AbstractPayClient<Config> createPayClient(Long channelId, String channelCode,
+                                                                                       Config config) {
+        PayChannelEnum channelEnum = PayChannelEnum.getByCode(channelCode);
+        Assert.notNull(channelEnum, String.format("支付渠道(%s) 为空", channelCode));
+        Class<?> payClientClass = clientClass.get(channelEnum);
+        Assert.notNull(payClientClass, String.format("支付渠道(%s) Class 为空", channelCode));
+        return (AbstractPayClient<Config>) ReflectUtil.newInstance(payClientClass, channelId, config);
+    }
+
 }

yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImplIntegrationTest.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayQrPayClient;
 import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayWapPayClient;
 import cn.iocoder.yudao.framework.pay.core.client.impl.weixin.WxPayClientConfig;
 import cn.iocoder.yudao.framework.pay.core.client.impl.weixin.WxPubPayClient;
+import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -40,8 +41,7 @@ public class PayClientFactoryImplIntegrationTest {
         config.setMchKey("0alL64UDQdlCwiKZ73ib7ypaIjMns06p");
         // 创建客户端
         Long channelId = RandomUtil.randomLong();
-
-        payClientFactory.addOrUpdatePayClient(channelId,  new WxPubPayClient(channelId,  config));
+        payClientFactory.createOrUpdatePayClient(channelId, PayChannelEnum.WX_PUB.getCode(), config);
         PayClient client = payClientFactory.getPayClient(channelId);
         // 发起支付
         PayOrderUnifiedReqDTO reqDTO = buildPayOrderUnifiedReqDTO();
@@ -64,7 +64,7 @@ public class PayClientFactoryImplIntegrationTest {
         config.setApiV3Key("joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase");
         // 创建客户端
         Long channelId = RandomUtil.randomLong();
-        payClientFactory.addOrUpdatePayClient(channelId, new WxPubPayClient(channelId,  config));
+        payClientFactory.createOrUpdatePayClient(channelId, PayChannelEnum.WX_PUB.getCode(), config);
         PayClient client = payClientFactory.getPayClient(channelId);
         // 发起支付
         PayOrderUnifiedReqDTO reqDTO = buildPayOrderUnifiedReqDTO();
@@ -87,7 +87,7 @@ public class PayClientFactoryImplIntegrationTest {
         config.setAlipayPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnq90KnF4dTnlzzmxpujbI05OYqi5WxAS6cL0gnZFv2gK51HExF8v/BaP7P979PhFMgWTqmOOI+Dtno5s+yD09XTY1WkshbLk6i4g2Xlr8fyW9ODnkU88RI2w9UdPhQU4cPPwBNlrsYhKkVK2OxwM3kFqjoBBY0CZoZCsSQ3LDH5WeZqPArlsS6xa2zqJBuuoKjMrdpELl3eXSjP8K54eDJCbeetCZNKWLL3DPahTPB7LZikfYmslb0QUvCgGapD0xkS7eVq70NaL1G57MWABs4tbfWgxike4Daj3EfUrzIVspQxj7w8HEj9WozJPgL88kSJSits0pqD3n5r8HSuseQIDAQAB");
         // 创建客户端
         Long channelId = RandomUtil.randomLong();
-        payClientFactory.addOrUpdatePayClient(channelId, new AlipayQrPayClient(channelId,  config));
+        payClientFactory.createOrUpdatePayClient(channelId, PayChannelEnum.ALIPAY_QR.getCode(), config);
         PayClient client = payClientFactory.getPayClient(channelId);
         // 发起支付
         PayOrderUnifiedReqDTO reqDTO = buildPayOrderUnifiedReqDTO();
@@ -111,7 +111,7 @@ public class PayClientFactoryImplIntegrationTest {
         config.setAlipayPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnq90KnF4dTnlzzmxpujbI05OYqi5WxAS6cL0gnZFv2gK51HExF8v/BaP7P979PhFMgWTqmOOI+Dtno5s+yD09XTY1WkshbLk6i4g2Xlr8fyW9ODnkU88RI2w9UdPhQU4cPPwBNlrsYhKkVK2OxwM3kFqjoBBY0CZoZCsSQ3LDH5WeZqPArlsS6xa2zqJBuuoKjMrdpELl3eXSjP8K54eDJCbeetCZNKWLL3DPahTPB7LZikfYmslb0QUvCgGapD0xkS7eVq70NaL1G57MWABs4tbfWgxike4Daj3EfUrzIVspQxj7w8HEj9WozJPgL88kSJSits0pqD3n5r8HSuseQIDAQAB");
         // 创建客户端
         Long channelId = RandomUtil.randomLong();
-        payClientFactory.addOrUpdatePayClient(channelId, new AlipayWapPayClient(channelId, config));
+        payClientFactory.createOrUpdatePayClient(channelId, PayChannelEnum.ALIPAY_WAP.getCode(), config);
         PayClient client = payClientFactory.getPayClient(channelId);
         // 发起支付
         PayOrderUnifiedReqDTO reqDTO = buildPayOrderUnifiedReqDTO();

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/wallet/WalletPayClient.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.pay.framework.pay.wallet;
 
+import cn.hutool.extra.spring.SpringUtil;
 import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
@@ -7,6 +8,7 @@ import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO;
 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
 import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient;
 import cn.iocoder.yudao.framework.pay.core.client.impl.NonePayClientConfig;
+import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
 import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
 import cn.iocoder.yudao.module.pay.service.wallet.PayWalletService;
 import lombok.extern.slf4j.Slf4j;
@@ -23,30 +25,26 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC
 @Slf4j
 public class WalletPayClient extends AbstractPayClient<NonePayClientConfig> {
 
-    private PayWalletService payWalletService;
+    private PayWalletService client;
 
-    public WalletPayClient(Long channelId, String channelCode, NonePayClientConfig config) {
-        super(channelId, channelCode, config);
-    }
-
-    public WalletPayClient(Long channelId, String channelCode, NonePayClientConfig config,
-                           PayWalletService payWalletService) {
-        this(channelId, channelCode, config);
-        this.payWalletService = payWalletService;
+    public WalletPayClient(Long channelId,  NonePayClientConfig config) {
+        super(channelId, PayChannelEnum.WALLET.getCode(), config);
     }
 
     @Override
     protected void doInit() {
-        // 钱包支付，无需初始化
+        if (client == null) {
+            client = SpringUtil.getBean(PayWalletService.class);
+        }
     }
 
     @Override
     protected PayOrderRespDTO doUnifiedOrder(PayOrderUnifiedReqDTO reqDTO) {
         try {
-            PayWalletTransactionDO transaction = payWalletService.pay(reqDTO.getOutTradeNo(), reqDTO.getPrice());
+            PayWalletTransactionDO transaction = client.pay(reqDTO.getOutTradeNo(), reqDTO.getPrice());
             return PayOrderRespDTO.successOf(transaction.getNo(), transaction.getCreator(),
                     transaction.getTransactionTime(),
-                    reqDTO.getOutTradeNo(), "WALLET_PAY_SUCCESS"); // TODO @jason：transaction 作为 traData 好了；
+                    reqDTO.getOutTradeNo(), transaction);
         } catch (Throwable ex) {
             log.error("[doUnifiedOrder] 失败", ex);
             Integer errorCode = INTERNAL_SERVER_ERROR.getCode();
@@ -74,10 +72,10 @@ public class WalletPayClient extends AbstractPayClient<NonePayClientConfig> {
     @Override
     protected PayRefundRespDTO doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) {
         try {
-            PayWalletTransactionDO payWalletTransaction = payWalletService.refund(reqDTO.getOutRefundNo(),
+            PayWalletTransactionDO payWalletTransaction = client.refund(reqDTO.getOutRefundNo(),
                     reqDTO.getRefundPrice(), reqDTO.getReason());
             return PayRefundRespDTO.successOf(payWalletTransaction.getNo(), payWalletTransaction.getTransactionTime(),
-                    reqDTO.getOutRefundNo(), "WALLET_REFUND_SUCCESS");
+                    reqDTO.getOutRefundNo(), payWalletTransaction);
         } catch (Throwable ex) {
             log.error("[doUnifiedRefund] 失败", ex);
             Integer errorCode = INTERNAL_SERVER_ERROR.getCode();

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceImpl.java

@@ -8,12 +8,6 @@ import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig;
 import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
-import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient;
-import cn.iocoder.yudao.framework.pay.core.client.impl.NonePayClientConfig;
-import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.*;
-import cn.iocoder.yudao.framework.pay.core.client.impl.mock.MockPayClient;
-import cn.iocoder.yudao.framework.pay.core.client.impl.mock.MockPayClientConfig;
-import cn.iocoder.yudao.framework.pay.core.client.impl.weixin.*;
 import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
 import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
 import cn.iocoder.yudao.module.pay.controller.admin.channel.vo.PayChannelCreateReqVO;
@@ -22,7 +16,6 @@ import cn.iocoder.yudao.module.pay.convert.channel.PayChannelConvert;
 import cn.iocoder.yudao.module.pay.dal.dataobject.channel.PayChannelDO;
 import cn.iocoder.yudao.module.pay.dal.mysql.channel.PayChannelMapper;
 import cn.iocoder.yudao.module.pay.framework.pay.wallet.WalletPayClient;
-import cn.iocoder.yudao.module.pay.service.wallet.PayWalletService;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -64,14 +57,14 @@ public class PayChannelServiceImpl implements PayChannelService {
 
     @Resource
     private Validator validator;
-    @Resource
-    private PayWalletService payWalletService;
 
     /**
      * 初始化 {@link #payClientFactory} 缓存
      */
     @PostConstruct
     public void initLocalCache() {
+        // 注册钱包支付 Class
+        payClientFactory.registerPayClientClass(PayChannelEnum.WALLET, WalletPayClient.class);
         // 注意：忽略自动多租户，因为要全局初始化缓存
         TenantUtils.executeIgnore(() -> {
             // 第一步：查询数据
@@ -86,54 +79,11 @@ public class PayChannelServiceImpl implements PayChannelService {
             }
             log.info("[initLocalCache][缓存支付渠道，数量为:{}]", channels.size());
             // 第二步：构建缓存：创建或更新支付 Client
-            channels.forEach(payChannel ->{
-                AbstractPayClient<PayClientConfig> payClient = createPayClient(payChannel.getId(), payChannel.getCode(), payChannel.getConfig());
-                payClientFactory.addOrUpdatePayClient(payChannel.getId(), payClient);
-
-            });
+            channels.forEach(payChannel -> payClientFactory.createOrUpdatePayClient(payChannel.getId(),
+                    payChannel.getCode(), payChannel.getConfig()));
             this.channelCache = channels;
         });
     }
-    @SuppressWarnings("unchecked")
-    private <Config extends PayClientConfig> AbstractPayClient<Config> createPayClient(
-            Long channelId, String channelCode, Config config) {
-        PayChannelEnum channelEnum = PayChannelEnum.getByCode(channelCode);
-        Assert.notNull(channelEnum, String.format("支付渠道(%s) 为空", channelEnum));
-        // 创建客户端
-        switch (channelEnum) {
-            // 微信支付
-            case WX_PUB:
-                return (AbstractPayClient<Config>) new WxPubPayClient(channelId, (WxPayClientConfig) config);
-            case WX_LITE:
-                return (AbstractPayClient<Config>) new WxLitePayClient(channelId, (WxPayClientConfig) config);
-            case WX_APP:
-                return (AbstractPayClient<Config>) new WxAppPayClient(channelId, (WxPayClientConfig) config);
-            case WX_BAR:
-                return (AbstractPayClient<Config>) new WxBarPayClient(channelId, (WxPayClientConfig) config);
-            case WX_NATIVE:
-                return (AbstractPayClient<Config>) new WxNativePayClient(channelId, (WxPayClientConfig) config);
-            // 支付宝支付
-            case ALIPAY_WAP:
-                return (AbstractPayClient<Config>) new AlipayWapPayClient(channelId, (AlipayPayClientConfig) config);
-            case ALIPAY_QR:
-                return (AbstractPayClient<Config>) new AlipayQrPayClient(channelId, (AlipayPayClientConfig) config);
-            case ALIPAY_APP:
-                return (AbstractPayClient<Config>) new AlipayAppPayClient(channelId, (AlipayPayClientConfig) config);
-            case ALIPAY_PC:
-                return (AbstractPayClient<Config>) new AlipayPcPayClient(channelId, (AlipayPayClientConfig) config);
-            case ALIPAY_BAR:
-                return (AbstractPayClient<Config>) new AlipayBarPayClient(channelId, (AlipayPayClientConfig) config);
-            // 其它支付
-            case MOCK:
-                return (AbstractPayClient<Config>) new MockPayClient(channelId, (MockPayClientConfig) config);
-            case WALLET:
-                return (AbstractPayClient<Config>) new WalletPayClient(
-                        channelId, channelCode, (NonePayClientConfig) config, payWalletService);
-        }
-        // 创建失败，错误日志 + 抛出异常
-        log.error("[createPayClient][配置({}) 找不到合适的客户端实现]", config);
-        throw new IllegalArgumentException(String.format("配置(%s) 找不到合适的客户端实现", config));
-    }
 
     /**
      * 通过定时任务轮询，刷新缓存

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java

@@ -45,7 +45,6 @@ public class PayWalletServiceImpl implements  PayWalletService {
     private PayWalletMapper payWalletMapper;
     @Resource
     private PayNoRedisDAO noRedisDAO;
-
     @Resource
     private PayWalletTransactionService payWalletTransactionService;
     @Resource