From 52a40b6db35456112d8a470fc0e7f68207be6bfe Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 05 八月 2025 14:30:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 a329015..d5608fd 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
@@ -242,6 +242,8 @@
 	 * @return 行程单ID
 	 */
 	public static String createTravelItinerary(CreateTravelItineraryRequest request) {
+		request.setScene("TRAFFIC");
+		request.setPartnerId("522700");
 		//请求路径
 		String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/createTravelItinerary";
 		//私钥文件
@@ -513,7 +515,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 +526,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);
 		//请求路径
@@ -569,6 +571,8 @@
 	 * @return
 	 */
 	public static GetPaymentInfo paymentInfo(GetPaymentInfoDataRequest getPaymentInfoDataRequest) {
+		getPaymentInfoDataRequest.setPartnerId("5400004");
+		
 		GetPaymentInfoRequest request = new GetPaymentInfoRequest();
 		request.setRequstType("POST");
 		request.setBusType(1);
@@ -621,6 +625,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