1

src/main/java/com/fdkankan/pay/config/PayConfig.java

@@ -31,8 +31,6 @@ import java.util.Set;
 @Configuration
 @Slf4j
 public class PayConfig {
-    public static HashMap<Integer,AliConfig> aliConfigMap = new HashMap<>();
-    public static HashMap<Integer,WxConfig> wxConfigMap = new HashMap<>();
     public static HashMap<Integer,PaypalConfig> paypalConfigMap = new HashMap<>();
     public static HashMap<Integer,StripeConfig> stripeConfigMap = new HashMap<>();
 
@@ -54,17 +52,6 @@ public class PayConfig {
 
     public void setConfig() {
         log.info("启动初始化支付配置");
-        List<AliConfig> aliConfigList = aliConfigService.list();
-        if (!aliConfigList.isEmpty()) {
-            log.info("初始化AliConfig配置");
-            aliConfigList.forEach(e -> aliConfigMap.put(e.getServeId(),e));
-        }
-
-        List<WxConfig> wxConfigList = wxConfigService.list();
-        if (!wxConfigList.isEmpty()) {
-            log.info("初始化wxConfig配置");
-            wxConfigList.forEach(e -> wxConfigMap.put(e.getServeId(),e));
-        }
 
         List<PaypalConfig> paypalConfigList = paypalConfigService.list();
         if (!paypalConfigList.isEmpty()) {

src/main/java/com/fdkankan/pay/controller/OrderController.java

@@ -24,7 +24,7 @@ public class OrderController {
     public ResultData getByOrderSn(@PathVariable String orderSn){
         Order order = orderService.getByOrderSn(orderSn);
         if(order != null){
-            WxConfig wxConfig = PayConfig.wxConfigMap.get(order.getServeId());
+            WxConfig wxConfig = wxConfigService.getByServeId(order.getServeId());
             if(wxConfig != null){
                 order.setWxAppId(wxConfig.getAppid());
             }

src/main/java/com/fdkankan/pay/controller/PayController.java

@@ -40,7 +40,7 @@ public class PayController extends BaseController {
         if(order == null ){
             throw new BusinessException(ResultCode.ORDER_NOT_EXIST);
         }
-        WxConfig wxConfig = PayConfig.wxConfigMap.get(order.getServeId());
+        WxConfig wxConfig = wxConfigService.getByServeId(order.getServeId());
         if(wxConfig == null){
             throw new BusinessException(ResultCode.WX_CONFIG_NOT);
         }

src/main/java/com/fdkankan/pay/util/alipay/sdk/AlipayService.java

@@ -58,7 +58,7 @@ public class AlipayService {
         String orderSn = param.getOrderSn();
         BigDecimal amount = param.getOrderMoney();
         String subject = OrderSnUtil.getChinaName(param.getOrderType());
-        AliConfig aliConfig = PayConfig.aliConfigMap.get(param.getServeId());
+        AliConfig aliConfig = aliConfigService.getByServeId(param.getServeId());
         if(aliConfig == null){
             throw new BusinessException(ResultCode.ALIPAY_CONFIG_ERROR);
         }
@@ -309,7 +309,7 @@ public class AlipayService {
         String trade_no = null;
         String openId = null;
         try {
-            AliConfig aliConfig = PayConfig.aliConfigMap.get(order.getServeId());
+            AliConfig aliConfig = aliConfigService.getByServeId(order.getServeId());
             if(aliConfig == null){
                 log.error("ali-callBack--wxConfig-notexist");
                 return false;

src/main/java/com/fdkankan/pay/util/wx/WechatPayService.java

@@ -39,7 +39,7 @@ public class WechatPayService {
         String orderSn = param.getOrderSn();
         BigDecimal amount = param.getOrderMoney();
         String subject = OrderSnUtil.getChinaName(param.getOrderType());
-        WxConfig wxConfig = PayConfig.wxConfigMap.get(param.getServeId());
+        WxConfig wxConfig = wxConfigService.getByServeId(param.getServeId());
         if(wxConfig == null){
             throw new BusinessException(ResultCode.WX_CONFIG_NOT);
         }
@@ -185,7 +185,7 @@ public class WechatPayService {
         String trade_no = null;
         String openId = null;
         try {
-            WxConfig wxConfig = PayConfig.wxConfigMap.get(order.getServeId());
+            WxConfig wxConfig = wxConfigService.getByServeId(order.getServeId());
             if(wxConfig == null){
                 log.error("wx-callBack--wxConfig-notexist");
                 return false;