From 4485600cb2549dae5e18901aa3ac8ed34fc68ca3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 05 八月 2025 18:40:24 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
index 1078127..f5e94a7 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
@@ -11,6 +11,8 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.math.BigDecimal;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -242,6 +244,8 @@
 	 * @return 行程单ID
 	 */
 	public static String createTravelItinerary(CreateTravelItineraryRequest request) {
+		request.setScene("TRAFFIC");
+		request.setPartnerId("522700");
 		//请求路径
 		String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/createTravelItinerary";
 		//私钥文件
@@ -503,7 +507,14 @@
 		tradePayOffData.setScene("TRAFFIC");
 		tradePayOffData.setCurrency("RMB");
 		tradePayOffData.setRetUrl("");
-		tradePayOffData.setClientIp(System.getProperty("http.remoteAddr"));
+		InetAddress inetAddress = null;
+		try {
+			inetAddress = InetAddress.getLocalHost();
+		} catch (UnknownHostException e) {
+			throw new RuntimeException(e);
+		}
+		String ip = inetAddress.getHostAddress();
+		tradePayOffData.setClientIp(ip);
 		tradePayOffData.setNeedLoginFlag("N");
 		tradePayOffData.setAccessMode("APP");
 		List<PaymentInfoRequest> paymentInfoRequests = new ArrayList<>();
@@ -513,7 +524,7 @@
 		tradePayOffData.setPaymentInfos(paymentInfoRequests);
 		List<GoodsInfo> goodsInfo = new ArrayList<>();
 		GoodsInfo goodsInfo1 = new GoodsInfo();
-		goodsInfo1.setMerchantCode(":B00000872");
+		goodsInfo1.setMerchantCode("B00000872");
 		goodsInfo1.setCustId("CB0000004686");
 		goodsInfo1.setCustName("证联消费平台交易客户");
 		goodsInfo1.setProfitSharing("1");
@@ -524,7 +535,7 @@
 		TradeRequest request = new TradeRequest<TradePayOffData>();
 		request.setSceneId("1774717104844095488");
 		request.setAppId(QianYunTongProperties.appkey);
-		request.setConfigVersion(1);
+		request.setConfigVersion(2);
 		request.setRequestId(UUIDUtil.getRandomCode());
 		request.setData(tradePayOffData);
 		//请求路径
@@ -623,6 +634,11 @@
 	 * @return
 	 */
 	public static OrderInfo paymentOrder(PaymentOrderRequest request) {
+		request.setScene("TRAFFIC");
+		request.setMhltiCenterAppId("52270015");
+		request.setPayType(4);
+		request.setPayChannel(6);
+		request.setIsCompensate(1);
 		//请求路径
 		String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/paymentOrder";
 		//私钥文件

--
Gitblit v1.7.1