feats

src/main/java/com/yunzhi/nanyang/common/WxPayUtils.java

@@ -35,17 +35,16 @@ public class WxPayUtils {
     public WxPayUnifiedOrderV3Result createOrder(WxPayUnifiedOrderV3Request request, String client) throws WxPayException {
         // 北京时间
         LocalDateTime now = LocalDateTime.now(ZoneOffset.ofHours(8));
-        WxPayService payService = wxUtils.getPayService();
+        request.setNotifyUrl(servBase + "/wxpay/notify/"+client+"/order");
 
-        request.setNotifyUrl(servBase + "/wxpay/notify/order");
-
-        TradeTypeEnum tradeType = TradeTypeEnum.JSAPI;
         if ("ios".equals(client) || "android".equals(client)) {
-            tradeType = TradeTypeEnum.APP;
+            WxPayService payService = wxUtils.getAndroidPayService();
+            return payService.unifiedOrderV3(TradeTypeEnum.APP, request);
+        } else {
+            WxPayService payService = wxUtils.getMiniPayService();
+            return payService.unifiedOrderV3(TradeTypeEnum.JSAPI, request);
         }
 
-        return payService.unifiedOrderV3(tradeType, request);
-
 //        WxPayUnifiedOrderV3Result wxPayUnifiedOrderV3Result =
 //        return wxPayUnifiedOrderV3Result.getPayInfo(tradeType, request.getAppid(), request.getMchid(), payService.getConfig().getPrivateKey());
     }
@@ -56,10 +55,15 @@ public class WxPayUtils {
      * @return
      * @throws Exception
      */
-    public WxPayRefundV3Result refund(WxPayRefundV3Request request) throws Exception {
-        WxPayService payService = wxUtils.getPayService();
+    public WxPayRefundV3Result refund(WxPayRefundV3Request request, String client) throws Exception {
+        WxPayService payService = null;
+        if ("ios".equals(client) || "android".equals(client)) {
+            payService = wxUtils.getAndroidPayService();
+        } else {
+            payService = wxUtils.getMiniPayService();
+        }
 
-        request.setNotifyUrl(servBase + "/wxpay/notify/refund");
+        request.setNotifyUrl(servBase + "/wxpay/notify/"+client+"/refund");
         WxPayRefundV3Result result = payService.refundV3(request);
 
         if ("ABNORMAL".equals(result.getStatus())) {

src/main/java/com/yunzhi/nanyang/common/WxUtils.java

@@ -21,8 +21,10 @@ public class WxUtils {
     private static WxMaService workerService;
     // 农户小程序
     private static WxMaService farmerService;
-    // 微信支付
-    private static WxPayService payService;
+    // 小程序支付
+    private static WxPayService miniPayService;
+    // android 支付
+    private static WxPayService androidPayService;
 
     // 此处不能使用变量注入方式, 否则会是 null
     ISysMiniappService iSysMiniappService;
@@ -35,7 +37,8 @@ public class WxUtils {
         try {
             setWorkerService();
             setFarmerService();
-            setPayService();
+            setMiniPayService();
+            setAndroidPayService();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -92,17 +95,17 @@ public class WxUtils {
         return service;
     }
 
-    public WxPayService getPayService() {
-        if (payService == null) {
-            setPayService();
+    public WxPayService getMiniPayService() {
+        if (miniPayService == null) {
+            setMiniPayService();
         }
 
-        return payService;
+        return miniPayService;
     }
 
-    private void setPayService() {
+    private void setMiniPayService() {
         WxPayConfig payConfig = new WxPayConfig();
-        payConfig.setAppId(config.getPay().getAppId());
+        payConfig.setAppId(config.getPay().getMiniAppid());
         payConfig.setMchId(config.getPay().getMchId());
         payConfig.setMchKey(config.getPay().getMchKey());
         payConfig.setSubAppId(config.getPay().getSubAppId());
@@ -111,12 +114,38 @@ public class WxUtils {
         payConfig.setApiV3Key(config.getPay().getApiV3Key());
         payConfig.setPrivateKeyPath(config.getPay().getPrivateKeyPath());
         payConfig.setPrivateCertPath(config.getPay().getPrivateCertPath());
-        // 固定小程序支付
         payConfig.setTradeType(WxPayConstants.TradeType.JSAPI);
         // 可以指定是否使用沙箱环境
         payConfig.setUseSandboxEnv(false);
 
-        payService = new WxPayServiceImpl();
-        payService.setConfig(payConfig);
+        miniPayService = new WxPayServiceImpl();
+        miniPayService.setConfig(payConfig);
+    }
+
+    public WxPayService getAndroidPayService() {
+        if (androidPayService == null) {
+            setAndroidPayService();
+        }
+
+        return androidPayService;
+    }
+
+    private void setAndroidPayService() {
+        WxPayConfig payConfig = new WxPayConfig();
+        payConfig.setAppId(config.getPay().getMiniAppid());
+        payConfig.setMchId(config.getPay().getMchId());
+        payConfig.setMchKey(config.getPay().getMchKey());
+        payConfig.setSubAppId(config.getPay().getSubAppId());
+        payConfig.setSubMchId(config.getPay().getSubMchId());
+        payConfig.setKeyPath(config.getPay().getKeyPath());
+        payConfig.setApiV3Key(config.getPay().getApiV3Key());
+        payConfig.setPrivateKeyPath(config.getPay().getPrivateKeyPath());
+        payConfig.setPrivateCertPath(config.getPay().getPrivateCertPath());
+        payConfig.setTradeType(WxPayConstants.TradeType.APP);
+        // 可以指定是否使用沙箱环境
+        payConfig.setUseSandboxEnv(false);
+
+        androidPayService = new WxPayServiceImpl();
+        androidPayService.setConfig(payConfig);
     }
 }

src/main/java/com/yunzhi/nanyang/config/WeixinConfig.java

@@ -27,7 +27,8 @@ public class WeixinConfig {
 
     @Data
     public static class Pay {
-        private String appId;
+        private String miniAppid;
+        private String androidAppid;
         private String mchId;
         private String mchKey;
         private String subAppId;

src/main/java/com/yunzhi/nanyang/controller/TaPayController.java

@@ -54,13 +54,12 @@ public class TaPayController extends BaseController {
         }
 
         WxPayUnifiedOrderV3Result payResult = iTaPayService.createPay(client, clientId, taOrder);
-
-        WxPayConfig payConfig = wxUtils.getPayService().getConfig();
-
         if ("wx".equals(client)) {
+            WxPayConfig payConfig = wxUtils.getMiniPayService().getConfig();
             WxPayUnifiedOrderV3Result.JsapiResult result = payResult.getPayInfo(TradeTypeEnum.JSAPI, payConfig.getAppId(), payConfig.getMchId(), payConfig.getPrivateKey());
             return ResponseBean.success(result);
         } else {
+            WxPayConfig payConfig = wxUtils.getAndroidPayService().getConfig();
             WxPayUnifiedOrderV3Result.AppResult result = payResult.getPayInfo(TradeTypeEnum.APP, payConfig.getAppId(), payConfig.getMchId(), payConfig.getPrivateKey());
             return ResponseBean.success(result);
         }

src/main/java/com/yunzhi/nanyang/controller/WxPayController.java

@@ -8,10 +8,7 @@ import com.yunzhi.nanyang.common.WxUtils;
 import com.yunzhi.nanyang.service.ITaPayService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "微信小程序")
 @RestController
@@ -25,9 +22,16 @@ public class WxPayController extends BaseController {
     ITaPayService orderPayService;
 
     @ResponseBody
-    @RequestMapping("/notify/order")
-    public String payNotify(@RequestBody String jsonData) {
-        WxPayService payService = wxUtils.getPayService();
+    @RequestMapping("/notify/{client}/order")
+    public String payNotify(@PathVariable String client,
+                            @RequestBody String jsonData) {
+        WxPayService payService = null;
+        if ("ios".equals(client) || "android".equals(client)) {
+            payService = wxUtils.getAndroidPayService();
+        } else {
+            payService = wxUtils.getMiniPayService();
+        }
+
         WxPayOrderNotifyV3Result result = null;
         try {
             result = payService.parseOrderNotifyV3Result(jsonData, null);
@@ -42,9 +46,16 @@ public class WxPayController extends BaseController {
     }
 
     @ResponseBody
-    @RequestMapping("/notify/refund")
-    public String refundNotify(@RequestBody String jsonData) {
-        WxPayService payService = wxUtils.getPayService();
+    @RequestMapping("/notify/{client}/refund")
+    public String refundNotify(@PathVariable String client,
+                               @RequestBody String jsonData) {
+        WxPayService payService = null;
+        if ("ios".equals(client) || "android".equals(client)) {
+            payService = wxUtils.getAndroidPayService();
+        } else {
+            payService = wxUtils.getMiniPayService();
+        }
+
         WxPayRefundNotifyV3Result result = null;
         try {
             result = payService.parseRefundNotifyV3Result(jsonData, null);

src/main/java/com/yunzhi/nanyang/service/impl/TaPayServiceImpl.java

@@ -195,7 +195,7 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
         amount.setCurrency("CNY");
         request.setAmount(amount);
 
-        wxPayUtils.refund(request);
+        wxPayUtils.refund(request, client);
         if (StringUtils.isEmpty(taPay.getPayId())) {
             // 退款申请中 ...
             taOrder.setPayStatus(Constants.PAY_REFUNDING);

src/main/resources/application.yml

@@ -80,7 +80,8 @@ weixin:
     aesKey:
     msgDataFormat: JSON
   pay:
-    appId: wx94f23e5b285c046d
+    miniAppid: wx94f23e5b285c046d
+    androidAppid: wx0969b05b5393ae17
     mchId: 1621038483
     mchKey: #商户密钥
     subAppId: #服务商模式下的子商户公众账号ID