From f3106694f7f9992391b26897571ff11462cfe475 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 18 九月 2025 10:27:03 +0800
Subject: [PATCH] 修改bug
---
DispatchQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/DispatchQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java b/DispatchQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
index 04270a9..8e67357 100644
--- a/DispatchQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
+++ b/DispatchQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
@@ -690,11 +690,11 @@
/**
* 订单退款
- * @param request
+ * @param request1
* @return
*/
- public static TradeOrderRefund tradeOrderRefund(TradeOrderRefundRequest request) {
- request.setPayPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5400004" : "5401007");
+ public static TradeOrderRefund tradeOrderRefund(TradeOrderRefundRequest request1) {
+ request1.setPayPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004");
//请求路径
String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/tradeOrderRefund";
//私钥文件
@@ -706,6 +706,13 @@
Map<String, Object> contentMap = new HashMap<String, Object>();
Date nowdate = new Date();
SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss");
+
+ TradeRequest request = new TradeRequest<TradeOrderRefundRequest>();
+ request.setSceneId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "1968487381046722560" : "1726529285264269312");
+ request.setAppId(qianYunTongConfig.getAppkey());
+ request.setConfigVersion("prod".equals(qianYunTongConfig.getActiveProfile()) ? 1 : 6);
+ request.setRequestId(UUIDUtil.getRandomCode());
+ request.setData(request1);
String timeStamp = date.format(nowdate);
String messageId = UUIDUtil.getRandomCode();
@@ -726,11 +733,18 @@
}
JSONObject refundInfo = jsonObject.getJSONObject("busiResp").getJSONObject("refundInfo");
String retCode = refundInfo.getString("retCode");
- if(!"".equals(retCode)){
+ if(!"0".equals(retCode)){
log.error("【订单退款】失败:" + refundInfo.getString("retMsg"));
throw new RuntimeException("【订单退款】失败:" + refundInfo.getString("retMsg"));
}
- TradeOrderRefund tradeOrderRefund = refundInfo.getObject("data", TradeOrderRefund.class);
+ JSONObject object = refundInfo.getJSONObject("object");
+ String retCode1 = object.getString("retCode");
+ if(!"000000".equals(retCode1)){
+ log.error("【订单退款】失败:" + object.getString("retMsg"));
+ throw new RuntimeException("【订单退款】失败:" + object.getString("retMsg"));
+ }
+
+ TradeOrderRefund tradeOrderRefund = object.getObject("data", TradeOrderRefund.class);
return tradeOrderRefund;
}
@@ -781,10 +795,10 @@
* @param orderId
*/
public static void tradeOrderCancel(String orderId) {
- TradeOrderCancelRequest request = new TradeOrderCancelRequest();
- request.setScene("TRAFFIC");
- request.setMhltiCenterAppId("52270015");
- request.setOrderId(orderId);
+ TradeOrderCancelRequest request1 = new TradeOrderCancelRequest();
+ request1.setScene("TRAFFIC");
+ request1.setMhltiCenterAppId("52270015");
+ request1.setOrderId(orderId);
//请求路径
String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/tradeOrderCancel";
@@ -798,6 +812,13 @@
Date nowdate = new Date();
SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss");
+ TradeRequest request = new TradeRequest<TradeOrderRefundRequest>();
+ request.setSceneId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "1968487841979760640" : "1963507067318833152");
+ request.setAppId(qianYunTongConfig.getAppkey());
+ request.setConfigVersion(1);
+ request.setRequestId(UUIDUtil.getRandomCode());
+ request.setData(request1);
+
String timeStamp = date.format(nowdate);
String messageId = UUIDUtil.getRandomCode();
contentMap.put(SystemParameterNames.getAppKey(), appKey);
--
Gitblit v1.7.1