Merge remote-tracking branch 'origin/dev' into dev

无关风月

3 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/task/TaskUtil.java

@@ -59,9 +59,7 @@
                String s1 = HttpUtil.queryTransBatRequest(WechatConstants.WE_CHAT_PAY_QUERY_URL_PRE + s,
                        "7EEA04429B006E12AAA421C002EC48BBEED5BE94",
                        "1665330417",
//                        "/usr/local/vx/apiclient_key.pem",
                        "D:\\apiclient_key.pem",
                        WechatConstants.WE_CHAT_QUERY_URL_SUF + s);
                        "/usr/local/vx/apiclient_key.pem", WechatConstants.WE_CHAT_QUERY_URL_SUF + s);
                System.err.println(s1);
                JSONObject jsonObject = JSONObject.parseObject(s1);
                String string = jsonObject.getString("state");
@@ -130,10 +128,7 @@
                    com.alibaba.fastjson2.JSONObject.toJSONString(postMap),
                    "7EEA04429B006E12AAA421C002EC48BBEED5BE94",
                    "1665330417",
                    "D:\\apiclient_key.pem",
//                    "/usr/local/vx/apiclient_key.pem",

                    "/v3/fund-app/mch-transfer/transfer-bills");
                    "/usr/local/vx/apiclient_key.pem", WechatConstants.WE_CHAT_URL_SUF);
            com.alibaba.fastjson2.JSONObject jsonObject = com.alibaba.fastjson2.JSONObject.parseObject(result);
//            WithdrawDetail withdrawDetail = new WithdrawDetail();
//            withdrawDetail.setWithdrawId(withdrawId);