fix: 允许V2沙箱与V3配置共存

Author: binarywang

weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java

@@ -368,9 +368,6 @@ public String getConfigKey(String mchId, String appId) {
   @Override
   public String getPayBaseUrl() {
     if (this.getConfig().isUseSandboxEnv()) {
-      if (StringUtils.isNotBlank(this.getConfig().getApiV3Key())) {
-        throw new WxRuntimeException("微信支付V3 目前不支持沙箱模式！");
-      }
       return this.getConfig().getApiHostWithPathPrefix() + "/xdc/apiv2sandbox";
     }
     return this.getConfig().getApiHostWithPathPrefix();

weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java

@@ -7,6 +7,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxRuntimeException;
 import me.chanjar.weixin.common.util.http.apache.ByteArrayResponseHandler;
 import me.chanjar.weixin.common.util.json.GsonParser;
 import org.apache.commons.lang3.StringUtils;
@@ -128,6 +129,7 @@ public String postV3(String url, String requestStr) throws WxPayException {
   }
 
   private String requestV3(String url, String requestStr, HttpRequestBase httpRequestBase) throws WxPayException {
+    this.checkV3SandboxNotSupported();
     CloseableHttpClient httpClient = this.createApiV3HttpClient();
     try (CloseableHttpResponse response = httpClient.execute(httpRequestBase)) {
       //v3已经改为通过状态码判断200 204 成功
@@ -163,6 +165,7 @@ public String patchV3(String url, String requestStr) throws WxPayException {
 
   @Override
   public String postV3WithWechatpaySerial(String url, String requestStr) throws WxPayException {
+    this.checkV3SandboxNotSupported();
     HttpPost httpPost = this.createHttpPost(url, requestStr);
     this.configureRequest(httpPost);
     CloseableHttpClient httpClient = this.createApiV3HttpClient();
@@ -199,6 +202,7 @@ public String postV3(String url, HttpPost httpPost) throws WxPayException {
 
   @Override
   public String requestV3(String url, HttpRequestBase httpRequest) throws WxPayException {
+    this.checkV3SandboxNotSupported();
     this.configureRequest(httpRequest);
     CloseableHttpClient httpClient = this.createApiV3HttpClient();
     try (CloseableHttpResponse response = httpClient.execute(httpRequest)) {
@@ -243,6 +247,7 @@ public String getV3WithWechatPaySerial(String url) throws WxPayException {
 
   @Override
   public InputStream downloadV3(String url) throws WxPayException {
+    this.checkV3SandboxNotSupported();
     HttpGet httpGet = new WxPayV3DownloadHttpGet(url);
     this.configureRequest(httpGet);
     CloseableHttpClient httpClient = this.createApiV3HttpClient();
@@ -285,6 +290,7 @@ public String deleteV3(String url) throws WxPayException {
   }
 
   private void configureRequest(HttpRequestBase request) {
+    this.checkV3SandboxNotSupported();
     String serialNumber = getWechatPaySerial(getConfig());
     String method = request.getMethod();
     request.addHeader(ACCEPT, APPLICATION_JSON);
@@ -300,6 +306,12 @@ private void configureRequest(HttpRequestBase request) {
       .build());
   }
 
+  private void checkV3SandboxNotSupported() {
+    if (this.getConfig().isUseSandboxEnv()) {
+      throw new WxRuntimeException("微信支付V3 目前不支持沙箱模式！");
+    }
+  }
+
   private CloseableHttpClient createApiV3HttpClient() throws WxPayException {
     CloseableHttpClient apiV3HttpClient = this.getConfig().getApiV3HttpClient();
     if (null == apiV3HttpClient) {

weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceSandboxTest.java

@@ -0,0 +1,39 @@
+package com.github.binarywang.wxpay.service.impl;
+
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import me.chanjar.weixin.common.error.WxRuntimeException;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.expectThrows;
+
+public class WxPayServiceSandboxTest {
+
+  @Test
+  public void shouldUseV2SandboxUrlWhenV3KeyIsConfigured() {
+    WxPayConfig config = new WxPayConfig();
+    config.setApiHostUrl("https://api.mch.weixin.qq.com");
+    config.setApiHostUrlPath("/payment-proxy");
+    config.setApiV3Key("v3-key");
+    config.setUseSandboxEnv(true);
+
+    WxPayServiceImpl service = new WxPayServiceImpl();
+    service.setConfig(config);
+
+    assertEquals(service.getPayBaseUrl(), "https://api.mch.weixin.qq.com/payment-proxy/xdc/apiv2sandbox");
+  }
+
+  @Test
+  public void shouldRejectV3RequestWhenSandboxIsEnabled() {
+    WxPayConfig config = new WxPayConfig();
+    config.setUseSandboxEnv(true);
+
+    WxPayServiceImpl service = new WxPayServiceImpl();
+    service.setConfig(config);
+
+    WxRuntimeException exception = expectThrows(WxRuntimeException.class,
+      () -> service.postV3("https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi", "{}"));
+
+    assertEquals(exception.getMessage(), "微信支付V3 目前不支持沙箱模式！");
+  }
+}