From 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 09:06:31 +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 |  125 ++++++++++++++++++++++++++++-------------
 1 files changed, 86 insertions(+), 39 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 bfd2a8d..cb09fb2 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
@@ -26,19 +26,19 @@
 //		CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
 //		request.setScene("TRAFFIC");
 //		request.setPartnerId("522700");
-//		request.setOrderNo("123456");
+//		request.setOrderNo("0123456");
 //		request.setCustomerId("11448156");
 //		request.setDriverId("11448158");
 //		request.setSupplierShopId("981100006005951");
 //		request.setServiceType(1);
 //		String travelItinerary = createTravelItinerary(request);
-//		System.err.println(travelItinerary);//1948565171253956608
+//		System.err.println(travelItinerary);//1948685426689200128
 		
 		//修改行程状态
 //		ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
 //		request.setScene("TRAFFIC");
 //		request.setPartnerId("522700");
-//		request.setOrderId("1948565171253956608");
+//		request.setOrderId("1948685426689200128");
 //		request.setStatus(7);
 //		request.setDriverId("11448158");
 //		request.setSupplierShopId("981100006005951");
@@ -53,11 +53,11 @@
 //		tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"0\"}");
 //		tradeOrderCreateData.setCharge(new BigDecimal("0.01"));
 //		tradeOrderCreateData.setChannelSource("GRJYCXWXXCX");
-//		tradeOrderCreateData.setOrderId("1948565171253956608");
-//		tradeOrderCreateData.setOrderNo("123456");
+//		tradeOrderCreateData.setOrderId("1948685426689200128");
+//		tradeOrderCreateData.setOrderNo("0123456");
 //		tradeOrderCreateData.setCustomerId("11448156");
 //		tradeOrderCreateData.setPayPartnerId("5400004");
-//		tradeOrderCreateData.setPartnerPayId("1948565171253956608");
+//		tradeOrderCreateData.setPartnerPayId("1948685426689200128");
 //		tradeOrderCreateData.setCurrency("RMB");
 //		tradeOrderCreateData.setTotalFee("1");
 //		tradeOrderCreateData.setRetUrl("/home/");
@@ -68,60 +68,107 @@
 //
 //		List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
 //		GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
-//		goodsInfoRequest.setId("1");
-//		goodsInfoRequest.setSubAppId(QianYunTongProperties.appId);
+//		goodsInfoRequest.setId("981100006005901");
+//		goodsInfoRequest.setSubAppId("wxcbad113185a243e1");
 //		goodsInfoRequest.setSubOpenId("oVLur6yFtED8ruXBWUFKXjzXJ_BQ");
 //		goodsInfoRequest.setProfitSharing("1");
+//		goodsInfoRequest.setAreaInfo("520100");
+//		goodsInfoRequest.setPayType("0");
+//		goodsInfoRequest.setBusinessType("10408");
 //		goodsInfo.add(goodsInfoRequest);
 //		tradeOrderCreateData.setGoodsInfo(goodsInfo);
 //		TradeOrderCreate tradeOrderCreate = tradeOrderCreate1(tradeOrderCreateData);
 //		System.err.println(tradeOrderCreate);
-//		//TradeOrderCreate(orderInfo=OrderInfo(orderId=1948565171253956608, status=null), payInfo=PayInfo(retCode=000000, retMsg=success, success=true, data=PayInfoData(redirectUrl=https://qhsctest.qytzt.cn/gray/mobile/index.html?f=allCashDesk&accessToken=5nUBXayFpfZz%2FXUZiMu9LyWg15VM5hbmhIjUt0hdmws%3D, payId=540000420250725000135518, status=null, payTime=null, payFee=null, paymentInfos=null), sign=ea01f3b186be02e43367b856fd2ec699))
+//		//TradeOrderCreate(orderInfo=OrderInfo(orderId=1948685426689200128, status=null), payInfo=PayInfo(retCode=000000, retMsg=success, success=true, data=PayInfoData(redirectUrl=https://qhsctest.qytzt.cn/gray/mobile/index.html?f=allCashDesk&accessToken=5nUBXayFpfZz%2FXUZiMu9L61szNy2MhjTJ938TeNnX0U%3D, payId=540000420250725000135548, status=null, payTime=null, payFee=null, paymentInfos=null), sign=c9d849ee21dcc401cee968d4d31de04f))
 		
 		//查询支付单信息
 //		GetPaymentInfoDataRequest getPaymentInfoDataRequest = new GetPaymentInfoDataRequest();
 //		getPaymentInfoDataRequest.setPartnerId("5400004");
-//		getPaymentInfoDataRequest.setPartnerPayId("1948565171253956608");
+//		getPaymentInfoDataRequest.setPartnerPayId("1948685426689200128");
 //		GetPaymentInfo getPaymentInfo = paymentInfo(getPaymentInfoDataRequest);
 //		System.err.println(getPaymentInfo);
 		
 		//拉起支付
-		TradePayOff1Data tradePayOff1Data = new TradePayOff1Data();
-		tradePayOff1Data.setPartnerId("5400004");
-		tradePayOff1Data.setScene("TRAFFIC");
-		tradePayOff1Data.setPartnerPayId("1948565171253956608");
-		tradePayOff1Data.setCurrency("RMB");
-		tradePayOff1Data.setTotalFee("1");
-		tradePayOff1Data.setRetUrl("/home/");
-		tradePayOff1Data.setClientIp("127.0.0.1");
-		tradePayOff1Data.setNeedLoginFlag("N");
-		tradePayOff1Data.setOrderDesc("出行订单支付");
-		tradePayOff1Data.setAccessMode("H5");
-		List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
-		GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
-		goodsInfoRequest.setId("1");
-		goodsInfoRequest.setSubAppId(QianYunTongProperties.appId);
-		goodsInfoRequest.setSubOpenId("oVLur6yFtED8ruXBWUFKXjzXJ_BQ");
-		goodsInfoRequest.setProfitSharing("1");
-		goodsInfo.add(goodsInfoRequest);
-		tradePayOff1Data.setGoodsInfo(goodsInfo);
-		PayInfo payInfo = tradePayOff1(tradePayOff1Data);
-		System.err.println(payInfo);
-
-
+//		TradePayOff1Data tradePayOff1Data = new TradePayOff1Data();
+//		tradePayOff1Data.setPartnerId("5400004");
+//		tradePayOff1Data.setScene("TRAFFIC");
+//		tradePayOff1Data.setPartnerPayId("1948685426689200128");
+//		tradePayOff1Data.setCurrency("RMB");
+//		tradePayOff1Data.setTotalFee("1");
+//		tradePayOff1Data.setRetUrl("/home/");
+//		tradePayOff1Data.setClientIp("127.0.0.1");
+//		tradePayOff1Data.setNeedLoginFlag("N");
+//		tradePayOff1Data.setOrderDesc("出行订单支付");
+//		tradePayOff1Data.setAccessMode("APP");
+//		List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
+//		GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
+//		goodsInfoRequest.setId("981100006005901");
+//		goodsInfoRequest.setSubAppId("wxcbad113185a243e1");
+//		goodsInfoRequest.setSubOpenId("oVLur6yFtED8ruXBWUFKXjzXJ_BQ");
+//		goodsInfoRequest.setProfitSharing("1");
+//		goodsInfoRequest.setAreaInfo("520100");
+//		goodsInfoRequest.setPayType("0");
+//		goodsInfoRequest.setBusinessType("10408");
+//		goodsInfo.add(goodsInfoRequest);
+//		tradePayOff1Data.setGoodsInfo(goodsInfo);
+//		PayInfo payInfo = tradePayOff1(tradePayOff1Data);
+//		System.err.println(payInfo);
+		//PayInfo(retCode=000000, retMsg=success, success=true, data=PayInfoData(redirectUrl=https://qhsctest.qytzt.cn/gray/mobile/index.html?f=allCashDesk&accessToken=5nUBXayFpfZz%2FXUZiMu9LzeRXmqmlqaCS%2BHfu5udIt4%3D, payId=540000420250725000135549, status=null, payTime=null, payFee=null, paymentInfos=null), sign=8154ba2728280900b122c56352c1c7fe)
+		
+		
+		// (补偿单)拉起支付
+//		TradePayOffData tradePayOffData = new TradePayOffData();
+//		tradePayOffData.setPartnerId("5400004");
+//		tradePayOffData.setScene("TRAFFIC");
+//		tradePayOffData.setPartnerPayId("1948685426689200128");
+//		tradePayOffData.setCurrency("RMB");
+//		tradePayOffData.setTotalFee("1");
+//		tradePayOffData.setRetUrl("/home/");
+//		tradePayOffData.setClientIp("127.0.0.1");
+//		tradePayOffData.setNeedLoginFlag("N");
+//		tradePayOffData.setOrderDesc("出行订单支付");
+//		tradePayOffData.setAccessMode("APP");
+//		List<PaymentInfoRequest> paymentInfoRequests = new ArrayList<>();
+//		PaymentInfoRequest paymentInfoRequest = new PaymentInfoRequest();
+//		paymentInfoRequest.setPayModeId("501212");
+//		paymentInfoRequests.add(paymentInfoRequest);
+//		tradePayOffData.setPaymentInfos(paymentInfoRequests);
+//		List<GoodsInfo> goodsInfo = new ArrayList<>();
+//		GoodsInfo goodsInfo1 = new GoodsInfo();
+//		goodsInfo1.setMerchantCode("");
+//		goodsInfo1.setCustId("");
+//		goodsInfo1.setCustName("");
+//		goodsInfo1.setProfitSharing("1");
+//		goodsInfo.add(goodsInfo1);
+//		tradePayOffData.setGoodsInfo(goodsInfo);
+//		PayInfo payInfo1 = tradePayOff(tradePayOffData);
+//		System.err.println(payInfo1);
+		
+		//订单创建
 //		CreateOrderRequest createOrderRequest = new CreateOrderRequest();
-//		createOrderRequest.setTreatShopId("");
+//		createOrderRequest.setTreatShopId("11448158");
 //		createOrderRequest.setOrderAppId("52270015");
 //		createOrderRequest.setScene("TRAFFIC");
 //		createOrderRequest.setPartnerId("522700");
-//		createOrderRequest.setField1("{\"profitSharing\":\"0\",\"isPromote\":\"0\"}");
+//		createOrderRequest.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"0\"}");
 //		createOrderRequest.setCharge(new BigDecimal("0.01"));
 //		createOrderRequest.setChannelSource("GRJYCXWXXCX");
-//		createOrderRequest.setOrderId("");
-//		createOrderRequest.setOrderNo("");
-//		createOrderRequest.setCustomerId("");
+//		createOrderRequest.setOrderId("1948685426689200128");
+//		createOrderRequest.setOrderNo("0123456");
+//		createOrderRequest.setCustomerId("11448156");
 //		OrderInfo orderInfo = tradeOrderCreate(createOrderRequest);
+//		System.err.println(orderInfo);
 		
+		//行程单列表查询
+//		GetTravelItineraryListRequest request = new GetTravelItineraryListRequest();
+//		request.setScene("TRAFFIC");
+//		request.setPartnerId("522700");
+//		request.setCustomerId("11448156");
+//		request.setOrderNo("0123456");
+//		request.setDriverId("11448158");
+//		ListPage<TravelItinerary> travelItineraryList = getTravelItineraryList(request);
+//		System.err.println(travelItineraryList);
+	
 	}
 	
 	/**
@@ -404,7 +451,7 @@
 	 */
 	public static PayInfo tradePayOff(TradePayOffData tradePayOffData) {
 		TradeRequest request = new TradeRequest<TradePayOffData>();
-		request.setSceneId(QianYunTongProperties.sceneId);
+		request.setSceneId("1774717104844095488");
 		request.setAppId(QianYunTongProperties.appkey);
 		request.setConfigVersion(1);
 		request.setRequestId(UUIDUtil.getRandomCode());

--
Gitblit v1.7.1