From 9a94c295952d513c1703aa8d3fcf54d17da168e5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 07 十月 2023 14:50:39 +0800
Subject: [PATCH] 对账

---
 server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java b/server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java
index 8225591..237c8fd 100644
--- a/server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java
+++ b/server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java
@@ -4,7 +4,10 @@
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import com.doumee.config.mybatis.SpringUtils;
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.service.WxPayService;
+import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
@@ -19,10 +22,10 @@
     /********寰俊灏忕▼搴忔湇鍔�**********/
     public static WxMaService wxMaService;
     /********寰俊灏忕▼搴忔敮浠�**********/
-    public static WxPayService wxPayService;
     /********寰俊APP鏀粯**********/
     public static WxPayService wxAppPayService;
 
+    public static WxPayService wxPayService;
 
     @Autowired
     private WxPayProperties wxPayProperties;
@@ -34,7 +37,7 @@
     @PostConstruct
     void init() {
         this.load_WxMaService();
-//        this.load_wxPayService();
+        this.load_wxPayService();
 //        this.load_wxAppPayService();
     }
     /**
@@ -55,19 +58,19 @@
     /**
      * 鍒濆鍖栧井淇″皬绋嬪簭鏀粯
      */
-//    public void load_wxPayService() {
-//        WxPayConfig payConfig = new WxPayConfig();
-//        payConfig.setTradeType(WxPayConstants.TradeType.JSAPI);
-//        payConfig.setSignType(WxPayConstants.SignType.MD5);
-//        payConfig.setAppId(StringUtils.trimToNull(wxPayProperties.getAppId()));
-//        payConfig.setMchId(StringUtils.trimToNull(wxPayProperties.getMchId()));
-//        payConfig.setMchKey(StringUtils.trimToNull(wxPayProperties.getMchKey()));
-//        payConfig.setKeyPath(StringUtils.trimToNull(wxPayProperties.getKeyPath()));
-//        payConfig.setNotifyUrl(StringUtils.trimToNull(wxPayProperties.getNotifyUrl()));
-//        WxPayService wxPayService = new WxPayServiceImpl();
-//        wxPayService.setConfig(payConfig);
-//        this.wxPayService = wxPayService;
-//    }
+    public void load_wxPayService() {
+        WxPayConfig payConfig = new WxPayConfig();
+        payConfig.setTradeType(WxPayConstants.TradeType.JSAPI);
+        payConfig.setSignType(WxPayConstants.SignType.MD5);
+        payConfig.setAppId(StringUtils.trimToNull(wxPayProperties.getAppId()));
+        payConfig.setMchId(StringUtils.trimToNull(wxPayProperties.getMchId()));
+        payConfig.setMchKey(StringUtils.trimToNull(wxPayProperties.getMchKey()));
+        payConfig.setKeyPath(StringUtils.trimToNull(wxPayProperties.getKeyPath()));
+        payConfig.setNotifyUrl(StringUtils.trimToNull(wxPayProperties.getNotifyUrl()));
+        WxPayService wxPayService = new WxPayServiceImpl();
+        wxPayService.setConfig(payConfig);
+        this.wxPayService = wxPayService;
+    }
 
 
 

--
Gitblit v1.9.3