From 0cfbaf9a439dc75824c52a6e58b6849064afbc80 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 19 七月 2025 10:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/java/com/doumee/config/wx/TransferToUser.java |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/config/wx/TransferToUser.java b/server/services/src/main/java/com/doumee/config/wx/TransferToUser.java
index af0b96e..15895e4 100644
--- a/server/services/src/main/java/com/doumee/config/wx/TransferToUser.java
+++ b/server/services/src/main/java/com/doumee/config/wx/TransferToUser.java
@@ -29,12 +29,20 @@
 
     public static void main(String[] args) {
         // TODO: 璇峰噯澶囧晢鎴峰紑鍙戝繀瑕佸弬鏁帮紝鍙傝�冿細https://pay.weixin.qq.com/doc/v3/merchant/4013070756
+//        TransferToUser client = new TransferToUser(
+//                "1229817002",                    // 鍟嗘埛鍙凤紝鏄敱寰俊鏀粯绯荤粺鐢熸垚骞跺垎閰嶇粰姣忎釜鍟嗘埛鐨勫敮涓�鏍囪瘑绗︼紝鍟嗘埛鍙疯幏鍙栨柟寮忓弬鑰� https://pay.weixin.qq.com/doc/v3/merchant/4013070756
+//                "3FE90C2F3D40A56E1C51926F31B8A8D22426CCE0",         // 鍟嗘埛API璇佷功搴忓垪鍙凤紝濡備綍鑾峰彇璇峰弬鑰� https://pay.weixin.qq.com/doc/v3/merchant/4013053053
+//                "d://wechatApiclient_key.pem",    // 鍟嗘埛API璇佷功绉侀挜鏂囦欢璺緞锛屾湰鍦版枃浠惰矾寰�
+//                "PUB_KEY_ID_0112298170022025071700291836000600",      // 寰俊鏀粯鍏挜ID锛屽浣曡幏鍙栬鍙傝�� https://pay.weixin.qq.com/doc/v3/merchant/4013038816
+//                "d://pub_key.pem"          // 寰俊鏀粯鍏挜鏂囦欢璺緞锛屾湰鍦版枃浠惰矾寰�
+//        );
+
         TransferToUser client = new TransferToUser(
-                "1229817002",                    // 鍟嗘埛鍙凤紝鏄敱寰俊鏀粯绯荤粺鐢熸垚骞跺垎閰嶇粰姣忎釜鍟嗘埛鐨勫敮涓�鏍囪瘑绗︼紝鍟嗘埛鍙疯幏鍙栨柟寮忓弬鑰� https://pay.weixin.qq.com/doc/v3/merchant/4013070756
-                "3FE90C2F3D40A56E1C51926F31B8A8D22426CCE0",         // 鍟嗘埛API璇佷功搴忓垪鍙凤紝濡備綍鑾峰彇璇峰弬鑰� https://pay.weixin.qq.com/doc/v3/merchant/4013053053
+                "1661772003",                    // 鍟嗘埛鍙凤紝鏄敱寰俊鏀粯绯荤粺鐢熸垚骞跺垎閰嶇粰姣忎釜鍟嗘埛鐨勫敮涓�鏍囪瘑绗︼紝鍟嗘埛鍙疯幏鍙栨柟寮忓弬鑰� https://pay.weixin.qq.com/doc/v3/merchant/4013070756
+                "3C9A32FB6CD453FAAAF97F9737ECAEA9D6625727",         // 鍟嗘埛API璇佷功搴忓垪鍙凤紝濡備綍鑾峰彇璇峰弬鑰� https://pay.weixin.qq.com/doc/v3/merchant/4013053053
                 "d://wechatApiclient_key.pem",    // 鍟嗘埛API璇佷功绉侀挜鏂囦欢璺緞锛屾湰鍦版枃浠惰矾寰�
-                "PUB_KEY_ID_0112298170022025071700291836000600",      // 寰俊鏀粯鍏挜ID锛屽浣曡幏鍙栬鍙傝�� https://pay.weixin.qq.com/doc/v3/merchant/4013038816
-                "d://pub_key.pem"          // 寰俊鏀粯鍏挜鏂囦欢璺緞锛屾湰鍦版枃浠惰矾寰�
+                "47E172124E73E8098A565E971064C20ACDE7C911",      // 寰俊鏀粯鍏挜ID锛屽浣曡幏鍙栬鍙傝�� https://pay.weixin.qq.com/doc/v3/merchant/4013038816
+                "d://wechatpay_47E172124E73E8098A565E971064C20ACDE7C911.pem"          // 寰俊鏀粯鍏挜鏂囦欢璺緞锛屾湰鍦版枃浠惰矾寰�
         );
 
         TransferToUserRequest request = new TransferToUserRequest();
@@ -42,10 +50,10 @@
         request.outBillNo = "plfk2020042016";
         request.transferSceneId = "1005";
         request.openid = "oKKHU5IFKpss_DIbFX1lqghFJOEg";
-        request.userName = client.encrypt("鏂芥棴杈�");
-        request.transferAmount = 91L;
+//        request.userName = client.encrypt("鏂芥棴杈�");
+        request.transferAmount = 10L;
         request.transferRemark = "~~~";
-        request.notifyUrl = "https://www.weixin.qq.com/wxpay/pay.php";
+//        request.notifyUrl = "https://www.weixin.qq.com/wxpay/pay.php";
         request.userRecvPerception = "鍔冲姟鎶ラ叕";
         request.transferSceneReportInfos = new ArrayList<>();
         {
@@ -118,6 +126,7 @@
     public TransferToUserResponse run(TransferToUserRequest request,String name) {
         String uri = PATH;
         request.appid = WxMiniConfig.wxProperties.getSubAppId();
+//        request.notifyUrl = WxMiniConfig.wxProperties.getWechatNotifyUrl();
         request.transferSceneId = "1005";
         request.userRecvPerception = "鍔冲姟鎶ラ叕";
         if(request.transferAmount >= 30){
@@ -140,7 +149,7 @@
         Request.Builder reqBuilder = new Request.Builder().url(HOST + uri);
         reqBuilder.addHeader("Accept", "application/json");
         reqBuilder.addHeader("Wechatpay-Serial", WxMiniConfig.wxProperties.getWechatPayPublicKeyId());
-        reqBuilder.addHeader("Authorization", WXPayUtility.buildAuthorization(WxMiniConfig.wxProperties.getMchId(),
+        reqBuilder.addHeader("Authorization", WXPayUtility.buildAuthorization(WxMiniConfig.wxProperties.getSubMchId(),
                 WxMiniConfig.wxProperties.getWechatSerialNumer(),
                 WXPayUtility.loadPrivateKeyFromPath(WxMiniConfig.wxProperties.getWechatPrivateKeyPath()),
                 METHOD, uri, reqBody));
@@ -178,7 +187,7 @@
         Request.Builder reqBuilder = new Request.Builder().url(HOST + uri);
         reqBuilder.addHeader("Accept", "application/json");
         reqBuilder.addHeader("Wechatpay-Serial", wechatPayPublicKeyId);
-        reqBuilder.addHeader("Authorization", WXPayUtility.buildAuthorization(WxMiniConfig.wxProperties.getMchId(),
+        reqBuilder.addHeader("Authorization", WXPayUtility.buildAuthorization(WxMiniConfig.wxProperties.getSubMchId(),
                 WxMiniConfig.wxProperties.getWechatSerialNumer(),
                 WXPayUtility.loadPrivateKeyFromPath(WxMiniConfig.wxProperties.getWechatPrivateKeyPath()),
                 METHOD, uri, null));

--
Gitblit v1.9.3