修复商家转账API路径错误

Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com>

weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderV3Result.java

@@ -58,7 +58,7 @@ public class WxPayUnifiedOrderV3Result implements Serializable {
   /**
    * <pre>
    * 字段名：二维码链接（NATIVE支付 会返回）
-   * 变量名：code_url
+   * 变量名：h5_url
    * 是否必填：是
    * 类型：string[1,512]
    * 描述：
@@ -81,19 +81,6 @@ public class WxPayUnifiedOrderV3Result implements Serializable {
     private String packageValue;
     private String signType;
     private String paySign;
-    /**
-     * <pre>
-     * 字段名：预支付交易会话标识
-     * 变量名：prepay_id
-     * 是否必填：否（用户可选存储）
-     * 类型：string[1,64]
-     * 描述：
-     *  预支付交易会话标识。用于后续接口调用中使用，该值有效期为2小时
-     *  此字段用于支持用户存储prepay_id，以便复用和重新生成支付签名
-     *  示例值：wx201410272009395522657a690389285100
-     * </pre>
-     */
-    private String prepayId;
 
     private String getSignStr() {
       return String.format("%s\n%s\n%s\n%s\n", appId, timeStamp, nonceStr, packageValue);
@@ -126,7 +113,6 @@ public class WxPayUnifiedOrderV3Result implements Serializable {
         JsapiResult jsapiResult = new JsapiResult();
         jsapiResult.setAppId(appId).setTimeStamp(timestamp)
           .setPackageValue("prepay_id=" + this.prepayId).setNonceStr(nonceStr)
-          .setPrepayId(this.prepayId)
           //签名类型，默认为RSA，仅支持RSA。
           .setSignType("RSA").setPaySign(SignUtils.sign(jsapiResult.getSignStr(), privateKey));
         return (T) jsapiResult;
@@ -146,79 +132,4 @@ public class WxPayUnifiedOrderV3Result implements Serializable {
         throw new WxRuntimeException("不支持的支付类型");
     }
   }
-
-  /**
-   * <pre>
-   * 根据已有的prepay_id生成JSAPI支付所需的参数对象（解耦版本）
-   * 应用场景：
-   * 1. 用户已经通过createPartnerOrderV3或unifiedPartnerOrderV3获取了prepay_id
-   * 2. 用户希望存储prepay_id用于后续复用
-   * 3. 支付失败后，使用存储的prepay_id重新生成支付签名信息
-   * 
-   * 使用示例：
-   * // 步骤1：创建订单并获取prepay_id
-   * WxPayUnifiedOrderV3Result result = wxPayService.unifiedPartnerOrderV3(TradeTypeEnum.JSAPI, request);
-   * String prepayId = result.getPrepayId();
-   * // 存储prepayId到数据库...
-   * 
-   * // 步骤2：需要支付时，使用存储的prepay_id生成支付信息
-   * WxPayUnifiedOrderV3Result.JsapiResult payInfo = WxPayUnifiedOrderV3Result.getJsapiPayInfo(
-   *   prepayId, appId, wxPayService.getConfig().getPrivateKey()
-   * );
-   * </pre>
-   *
-   * @param prepayId   预支付交易会话标识
-   * @param appId      应用ID
-   * @param privateKey 商户私钥，用于签名
-   * @return JSAPI支付所需的参数对象
-   */
-  public static JsapiResult getJsapiPayInfo(String prepayId, String appId, PrivateKey privateKey) {
-    String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
-    String nonceStr = SignUtils.genRandomStr();
-    JsapiResult jsapiResult = new JsapiResult();
-    jsapiResult.setAppId(appId).setTimeStamp(timestamp)
-      .setPackageValue("prepay_id=" + prepayId).setNonceStr(nonceStr)
-      .setPrepayId(prepayId)
-      //签名类型，默认为RSA，仅支持RSA。
-      .setSignType("RSA").setPaySign(SignUtils.sign(jsapiResult.getSignStr(), privateKey));
-    return jsapiResult;
-  }
-
-  /**
-   * <pre>
-   * 根据已有的prepay_id生成APP支付所需的参数对象（解耦版本）
-   * 应用场景：
-   * 1. 用户已经通过createPartnerOrderV3或unifiedPartnerOrderV3获取了prepay_id
-   * 2. 用户希望存储prepay_id用于后续复用
-   * 3. 支付失败后，使用存储的prepay_id重新生成支付签名信息
-   * 
-   * 使用示例：
-   * // 步骤1：创建订单并获取prepay_id
-   * WxPayUnifiedOrderV3Result result = wxPayService.unifiedPartnerOrderV3(TradeTypeEnum.APP, request);
-   * String prepayId = result.getPrepayId();
-   * // 存储prepayId到数据库...
-   * 
-   * // 步骤2：需要支付时，使用存储的prepay_id生成支付信息
-   * WxPayUnifiedOrderV3Result.AppResult payInfo = WxPayUnifiedOrderV3Result.getAppPayInfo(
-   *   prepayId, appId, mchId, wxPayService.getConfig().getPrivateKey()
-   * );
-   * </pre>
-   *
-   * @param prepayId   预支付交易会话标识
-   * @param appId      应用ID
-   * @param mchId      商户号
-   * @param privateKey 商户私钥，用于签名
-   * @return APP支付所需的参数对象
-   */
-  public static AppResult getAppPayInfo(String prepayId, String appId, String mchId, PrivateKey privateKey) {
-    String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
-    String nonceStr = SignUtils.genRandomStr();
-    AppResult appResult = new AppResult();
-    appResult.setAppid(appId).setPrepayId(prepayId).setPartnerId(mchId)
-      .setNoncestr(nonceStr).setTimestamp(timestamp)
-      //暂填写固定值Sign=WXPay
-      .setPackageValue("Sign=WXPay")
-      .setSign(SignUtils.sign(appResult.getSignStr(), privateKey));
-    return appResult;
-  }
 }

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

@@ -21,7 +21,7 @@ public interface BusinessOperationTransferService {
    * 发起运营工具商家转账
    *
    * 请求方式：POST（HTTPS）
-   * 请求地址：https://api.mch.weixin.qq.com/v3/fund-app/operation/mch-transfer/transfer-bills
+   * 请求地址：https://api.mch.weixin.qq.com/v3/fund-app/mch-transfer/transfer-bills
    *
    * 文档地址：<a href="https://pay.weixin.qq.com/doc/v3/merchant/4012711988">运营工具-商家转账API</a>
    * </pre>
@@ -37,7 +37,7 @@ public interface BusinessOperationTransferService {
    * 查询运营工具转账结果
    *
    * 请求方式：GET（HTTPS）
-   * 请求地址：https://api.mch.weixin.qq.com/v3/fund-app/operation/mch-transfer/transfer-bills/out-bill-no/{out_bill_no}
+   * 请求地址：https://api.mch.weixin.qq.com/v3/fund-app/mch-transfer/transfer-bills/out-bill-no/{out_bill_no}
    *
    * 文档地址：<a href="https://pay.weixin.qq.com/doc/v3/merchant/4012711988">运营工具-商家转账API</a>
    * </pre>
@@ -53,7 +53,7 @@ public interface BusinessOperationTransferService {
    * 通过商户单号查询运营工具转账结果
    *
    * 请求方式：GET（HTTPS）
-   * 请求地址：https://api.mch.weixin.qq.com/v3/fund-app/operation/mch-transfer/transfer-bills/out-bill-no/{out_bill_no}
+   * 请求地址：https://api.mch.weixin.qq.com/v3/fund-app/mch-transfer/transfer-bills/out-bill-no/{out_bill_no}
    *
    * 文档地址：<a href="https://pay.weixin.qq.com/doc/v3/merchant/4012711988">运营工具-商家转账API</a>
    * </pre>
@@ -69,7 +69,7 @@ public interface BusinessOperationTransferService {
    * 通过微信转账单号查询运营工具转账结果
    *
    * 请求方式：GET（HTTPS）
-   * 请求地址：https://api.mch.weixin.qq.com/v3/fund-app/operation/mch-transfer/transfer-bills/transfer-bill-no/{transfer_bill_no}
+   * 请求地址：https://api.mch.weixin.qq.com/v3/fund-app/mch-transfer/transfer-bills/transfer-bill-no/{transfer_bill_no}
    *
    * 文档地址：<a href="https://pay.weixin.qq.com/doc/v3/merchant/4012711988">运营工具-商家转账API</a>
    * </pre>

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

@@ -33,7 +33,7 @@ public class BusinessOperationTransferServiceImpl implements BusinessOperationTr
       request.setAppid(this.wxPayService.getConfig().getAppId());
     }
 
-    String url = String.format("%s/v3/fund-app/operation/mch-transfer/transfer-bills", this.wxPayService.getPayBaseUrl());
+    String url = String.format("%s/v3/fund-app/mch-transfer/transfer-bills", this.wxPayService.getPayBaseUrl());
     
     // 如果传入了用户姓名，需要进行RSA加密
     if (StringUtils.isNotEmpty(request.getUserName())) {
@@ -58,7 +58,7 @@ public class BusinessOperationTransferServiceImpl implements BusinessOperationTr
 
   @Override
   public BusinessOperationTransferQueryResult queryOperationTransferByOutBillNo(String outBillNo) throws WxPayException {
-    String url = String.format("%s/v3/fund-app/operation/mch-transfer/transfer-bills/out-bill-no/%s",
+    String url = String.format("%s/v3/fund-app/mch-transfer/transfer-bills/out-bill-no/%s",
       this.wxPayService.getPayBaseUrl(), outBillNo);
     String response = wxPayService.getV3(url);
     return GSON.fromJson(response, BusinessOperationTransferQueryResult.class);
@@ -66,7 +66,7 @@ public class BusinessOperationTransferServiceImpl implements BusinessOperationTr
 
   @Override
   public BusinessOperationTransferQueryResult queryOperationTransferByTransferBillNo(String transferBillNo) throws WxPayException {
-    String url = String.format("%s/v3/fund-app/operation/mch-transfer/transfer-bills/transfer-bill-no/%s",
+    String url = String.format("%s/v3/fund-app/mch-transfer/transfer-bills/transfer-bill-no/%s",
       this.wxPayService.getPayBaseUrl(), transferBillNo);
     String response = wxPayService.getV3(url);
     return GSON.fromJson(response, BusinessOperationTransferQueryResult.class);

weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderV3ResultTest.java

@@ -1,201 +0,0 @@
-package com.github.binarywang.wxpay.bean.result;
-
-import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
-import com.github.binarywang.wxpay.v3.util.SignUtils;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-
-/**
- * <pre>
- * WxPayUnifiedOrderV3Result 测试类
- * 主要测试prepayId字段和静态工厂方法的解耦功能
- * </pre>
- *
- * @author copilot
- */
-public class WxPayUnifiedOrderV3ResultTest {
-
-  /**
-   * 生成测试用的RSA密钥对
-   */
-  private KeyPair generateKeyPair() throws Exception {
-    KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
-    keyPairGenerator.initialize(2048);
-    return keyPairGenerator.generateKeyPair();
-  }
-
-  /**
-   * 测试JsapiResult中的prepayId字段是否正确设置
-   */
-  @Test
-  public void testJsapiResultWithPrepayId() throws Exception {
-    // 准备测试数据
-    String testPrepayId = "wx201410272009395522657a690389285100";
-    String testAppId = "wx8888888888888888";
-    KeyPair keyPair = generateKeyPair();
-    PrivateKey privateKey = keyPair.getPrivate();
-
-    // 创建WxPayUnifiedOrderV3Result对象
-    WxPayUnifiedOrderV3Result result = new WxPayUnifiedOrderV3Result();
-    result.setPrepayId(testPrepayId);
-
-    // 调用getPayInfo生成JsapiResult
-    WxPayUnifiedOrderV3Result.JsapiResult jsapiResult =
-      result.getPayInfo(TradeTypeEnum.JSAPI, testAppId, null, privateKey);
-
-    // 验证prepayId字段是否正确设置
-    Assert.assertNotNull(jsapiResult.getPrepayId(), "prepayId不应为null");
-    Assert.assertEquals(jsapiResult.getPrepayId(), testPrepayId, "prepayId应该与设置的值相同");
-
-    // 验证其他字段
-    Assert.assertEquals(jsapiResult.getAppId(), testAppId);
-    Assert.assertNotNull(jsapiResult.getTimeStamp());
-    Assert.assertNotNull(jsapiResult.getNonceStr());
-    Assert.assertEquals(jsapiResult.getPackageValue(), "prepay_id=" + testPrepayId);
-    Assert.assertEquals(jsapiResult.getSignType(), "RSA");
-    Assert.assertNotNull(jsapiResult.getPaySign());
-  }
-
-  /**
-   * 测试使用静态工厂方法生成JsapiResult（解耦场景）
-   */
-  @Test
-  public void testGetJsapiPayInfoStaticMethod() throws Exception {
-    // 准备测试数据
-    String testPrepayId = "wx201410272009395522657a690389285100";
-    String testAppId = "wx8888888888888888";
-    KeyPair keyPair = generateKeyPair();
-    PrivateKey privateKey = keyPair.getPrivate();
-
-    // 使用静态工厂方法生成JsapiResult
-    WxPayUnifiedOrderV3Result.JsapiResult jsapiResult =
-      WxPayUnifiedOrderV3Result.getJsapiPayInfo(testPrepayId, testAppId, privateKey);
-
-    // 验证prepayId字段
-    Assert.assertNotNull(jsapiResult.getPrepayId(), "prepayId不应为null");
-    Assert.assertEquals(jsapiResult.getPrepayId(), testPrepayId, "prepayId应该与输入的值相同");
-
-    // 验证其他字段
-    Assert.assertEquals(jsapiResult.getAppId(), testAppId);
-    Assert.assertNotNull(jsapiResult.getTimeStamp());
-    Assert.assertNotNull(jsapiResult.getNonceStr());
-    Assert.assertEquals(jsapiResult.getPackageValue(), "prepay_id=" + testPrepayId);
-    Assert.assertEquals(jsapiResult.getSignType(), "RSA");
-    Assert.assertNotNull(jsapiResult.getPaySign());
-  }
-
-  /**
-   * 测试使用静态工厂方法生成AppResult（解耦场景）
-   */
-  @Test
-  public void testGetAppPayInfoStaticMethod() throws Exception {
-    // 准备测试数据
-    String testPrepayId = "wx201410272009395522657a690389285100";
-    String testAppId = "wx8888888888888888";
-    String testMchId = "1900000109";
-    KeyPair keyPair = generateKeyPair();
-    PrivateKey privateKey = keyPair.getPrivate();
-
-    // 使用静态工厂方法生成AppResult
-    WxPayUnifiedOrderV3Result.AppResult appResult =
-      WxPayUnifiedOrderV3Result.getAppPayInfo(testPrepayId, testAppId, testMchId, privateKey);
-
-    // 验证prepayId字段
-    Assert.assertNotNull(appResult.getPrepayId(), "prepayId不应为null");
-    Assert.assertEquals(appResult.getPrepayId(), testPrepayId, "prepayId应该与输入的值相同");
-
-    // 验证其他字段
-    Assert.assertEquals(appResult.getAppid(), testAppId);
-    Assert.assertEquals(appResult.getPartnerId(), testMchId);
-    Assert.assertNotNull(appResult.getTimestamp());
-    Assert.assertNotNull(appResult.getNoncestr());
-    Assert.assertEquals(appResult.getPackageValue(), "Sign=WXPay");
-    Assert.assertNotNull(appResult.getSign());
-  }
-
-  /**
-   * 测试解耦场景：先获取prepayId，后续再生成支付信息
-   */
-  @Test
-  public void testDecoupledScenario() throws Exception {
-    // 模拟场景：先创建订单获取prepayId
-    String testPrepayId = "wx201410272009395522657a690389285100";
-    String testAppId = "wx8888888888888888";
-    KeyPair keyPair = generateKeyPair();
-    PrivateKey privateKey = keyPair.getPrivate();
-
-    // 步骤1：模拟从创建订单接口获取prepayId
-    WxPayUnifiedOrderV3Result orderResult = new WxPayUnifiedOrderV3Result();
-    orderResult.setPrepayId(testPrepayId);
-
-    // 获取prepayId用于存储
-    String storedPrepayId = orderResult.getPrepayId();
-    Assert.assertEquals(storedPrepayId, testPrepayId);
-
-    // 步骤2：后续支付失败时，使用存储的prepayId重新生成支付信息
-    WxPayUnifiedOrderV3Result.JsapiResult newPayInfo =
-      WxPayUnifiedOrderV3Result.getJsapiPayInfo(storedPrepayId, testAppId, privateKey);
-
-    // 验证重新生成的支付信息
-    Assert.assertEquals(newPayInfo.getPrepayId(), storedPrepayId);
-    Assert.assertEquals(newPayInfo.getPackageValue(), "prepay_id=" + storedPrepayId);
-    Assert.assertNotNull(newPayInfo.getPaySign());
-  }
-
-  /**
-   * 测试多次生成支付信息，签名应该不同（因为timestamp和nonceStr每次都不同）
-   */
-  @Test
-  public void testMultipleGenerationsHaveDifferentSignatures() throws Exception {
-    String testPrepayId = "wx201410272009395522657a690389285100";
-    String testAppId = "wx8888888888888888";
-    KeyPair keyPair = generateKeyPair();
-    PrivateKey privateKey = keyPair.getPrivate();
-
-    // 生成第一次支付信息
-    WxPayUnifiedOrderV3Result.JsapiResult result1 =
-      WxPayUnifiedOrderV3Result.getJsapiPayInfo(testPrepayId, testAppId, privateKey);
-
-    // 等待一秒确保timestamp不同
-    Thread.sleep(1000);
-
-    // 生成第二次支付信息
-    WxPayUnifiedOrderV3Result.JsapiResult result2 =
-      WxPayUnifiedOrderV3Result.getJsapiPayInfo(testPrepayId, testAppId, privateKey);
-
-    // prepayId应该相同
-    Assert.assertEquals(result1.getPrepayId(), result2.getPrepayId());
-
-    // 但是timestamp、nonceStr和签名应该不同
-    Assert.assertNotEquals(result1.getTimeStamp(), result2.getTimeStamp(), "timestamp应该不同");
-    Assert.assertNotEquals(result1.getNonceStr(), result2.getNonceStr(), "nonceStr应该不同");
-    Assert.assertNotEquals(result1.getPaySign(), result2.getPaySign(), "签名应该不同");
-  }
-
-  /**
-   * 测试AppResult中的prepayId字段
-   */
-  @Test
-  public void testAppResultWithPrepayId() throws Exception {
-    String testPrepayId = "wx201410272009395522657a690389285100";
-    String testAppId = "wx8888888888888888";
-    String testMchId = "1900000109";
-    KeyPair keyPair = generateKeyPair();
-    PrivateKey privateKey = keyPair.getPrivate();
-
-    WxPayUnifiedOrderV3Result result = new WxPayUnifiedOrderV3Result();
-    result.setPrepayId(testPrepayId);
-
-    // 调用getPayInfo生成AppResult
-    WxPayUnifiedOrderV3Result.AppResult appResult =
-      result.getPayInfo(TradeTypeEnum.APP, testAppId, testMchId, privateKey);
-
-    // 验证prepayId字段
-    Assert.assertNotNull(appResult.getPrepayId(), "prepayId不应为null");
-    Assert.assertEquals(appResult.getPrepayId(), testPrepayId, "prepayId应该与设置的值相同");
-  }
-}