From b219589d73f46bd98995bceb4caf16dadb56b869 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 12 九月 2025 20:30:13 +0800
Subject: [PATCH] 修改bug

---
 ManagementQYTTravel/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/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
index ec396fc..29be15d 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
@@ -680,11 +680,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";
 		//私钥文件
@@ -696,6 +696,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()) ? "1954792737421942784" : "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();
@@ -716,11 +723,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;
 	}
 
@@ -771,10 +785,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";
@@ -788,6 +802,13 @@
 		Date nowdate = new Date();
 		SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss");
 
+		TradeRequest request = new TradeRequest<TradeOrderRefundRequest>();
+		request.setSceneId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "1954792737421942784" : "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