From 92480c7fd17a6bf89205ffcf4b78eef17988f0d5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 01 八月 2025 19:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java | 172 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 143 insertions(+), 29 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..5b1d0fa 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
@@ -10,6 +10,7 @@
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import lombok.extern.slf4j.Slf4j;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -26,19 +27,19 @@
// CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
// request.setScene("TRAFFIC");
// request.setPartnerId("522700");
-// request.setOrderNo("123456");
+// request.setOrderNo("3456789012345678");
// 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);//1951088602595872768
//修改行程状态
// ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
// request.setScene("TRAFFIC");
// request.setPartnerId("522700");
-// request.setOrderId("1948565171253956608");
+// request.setOrderId("1951088602595872768");
// request.setStatus(7);
// request.setDriverId("11448158");
// request.setSupplierShopId("981100006005951");
@@ -53,35 +54,38 @@
// tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"0\"}");
// tradeOrderCreateData.setCharge(new BigDecimal("0.01"));
// tradeOrderCreateData.setChannelSource("GRJYCXWXXCX");
-// tradeOrderCreateData.setOrderId("1948565171253956608");
-// tradeOrderCreateData.setOrderNo("123456");
+// tradeOrderCreateData.setOrderId("1951088602595872768");
+// tradeOrderCreateData.setOrderNo("3456789012345678");
// tradeOrderCreateData.setCustomerId("11448156");
// tradeOrderCreateData.setPayPartnerId("5400004");
-// tradeOrderCreateData.setPartnerPayId("1948565171253956608");
+// tradeOrderCreateData.setPartnerPayId("1951088602595872768");
// tradeOrderCreateData.setCurrency("RMB");
// tradeOrderCreateData.setTotalFee("1");
-// tradeOrderCreateData.setRetUrl("/home/");
+// tradeOrderCreateData.setRetUrl("pages/advoad-city-search/advoad-message/electronic-wait-pay/electronic-wait-pay");
// tradeOrderCreateData.setClientIp("127.0.0.1");
// tradeOrderCreateData.setNeedLoginFlag("N");
// tradeOrderCreateData.setOrderDesc("出行订单支付");
-// tradeOrderCreateData.setAccessMode("H5");
+// tradeOrderCreateData.setAccessMode("APP");
//
// List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
// GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
-// goodsInfoRequest.setId("1");
-// goodsInfoRequest.setSubAppId(QianYunTongProperties.appId);
-// goodsInfoRequest.setSubOpenId("oVLur6yFtED8ruXBWUFKXjzXJ_BQ");
+// goodsInfoRequest.setId("981100006005901");
+// goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
+// goodsInfoRequest.setSubOpenId("oVLur61wBKJEO7QPR1dsmzS5TSfs");
// 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=1950072223939842048, status=null), payInfo=PayInfo(retCode=000000, retMsg=success, success=true, data=PayInfoData(redirectUrl=https://qhsctest.qytzt.cn/gray/mobile/index.html?f=allCashDesk&accessToken=It5FPM1DUjzwIAin7zwiHvUANWKC6I5USCLE8EKoRkg%3D, payId=540000420250729000135600, status=null, payTime=null, payFee=null, paymentInfos=null), sign=525cb843b1eeb5a0451eeb5fbbe02f0f))
//查询支付单信息
// GetPaymentInfoDataRequest getPaymentInfoDataRequest = new GetPaymentInfoDataRequest();
// getPaymentInfoDataRequest.setPartnerId("5400004");
-// getPaymentInfoDataRequest.setPartnerPayId("1948565171253956608");
+// getPaymentInfoDataRequest.setPartnerPayId("1948685426689200128");
// GetPaymentInfo getPaymentInfo = paymentInfo(getPaymentInfoDataRequest);
// System.err.println(getPaymentInfo);
@@ -89,39 +93,83 @@
TradePayOff1Data tradePayOff1Data = new TradePayOff1Data();
tradePayOff1Data.setPartnerId("5400004");
tradePayOff1Data.setScene("TRAFFIC");
- tradePayOff1Data.setPartnerPayId("1948565171253956608");
+ tradePayOff1Data.setPartnerPayId("1951088602595872768");
tradePayOff1Data.setCurrency("RMB");
tradePayOff1Data.setTotalFee("1");
- tradePayOff1Data.setRetUrl("/home/");
+ tradePayOff1Data.setRetUrl("pages/advoad-city-search/advoad-message/electronic-wait-pay/electronic-wait-pay");
tradePayOff1Data.setClientIp("127.0.0.1");
tradePayOff1Data.setNeedLoginFlag("N");
tradePayOff1Data.setOrderDesc("出行订单支付");
- tradePayOff1Data.setAccessMode("H5");
+ tradePayOff1Data.setAccessMode("APP");
List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
- goodsInfoRequest.setId("1");
- goodsInfoRequest.setSubAppId(QianYunTongProperties.appId);
- goodsInfoRequest.setSubOpenId("oVLur6yFtED8ruXBWUFKXjzXJ_BQ");
+ goodsInfoRequest.setId("981100006005901");
+ goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
+ goodsInfoRequest.setSubOpenId("oVLur61wBKJEO7QPR1dsmzS5TSfs");
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);
+
}
/**
@@ -131,6 +179,22 @@
* @return
*/
public static PayInfo tradePayOff1(TradePayOff1Data tradePayOff1Data) {
+ tradePayOff1Data.setPartnerId("5400004");
+ tradePayOff1Data.setTimeout("72H");
+ tradePayOff1Data.setScene("TRAFFIC");
+ tradePayOff1Data.setCurrency("RMB");
+ tradePayOff1Data.setNeedLoginFlag("N");
+ tradePayOff1Data.setAccessMode("APP");
+ tradePayOff1Data.getGoodsInfo().forEach(goodsInfoRequest -> {
+ goodsInfoRequest.setId("981100006005901");
+ goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
+ goodsInfoRequest.setProfitSharing("1");
+ goodsInfoRequest.setAreaInfo("520100");
+ goodsInfoRequest.setPayType("0");
+ goodsInfoRequest.setBusinessType("10408");
+ });
+
+
TradeRequest request = new TradeRequest<TradePayOff1Data>();
request.setSceneId("1911676727023968256");
request.setAppId(QianYunTongProperties.appkey);
@@ -254,7 +318,10 @@
* @param request
* @return
*/
- public static ListPage<TravelItinerary> getTravelItineraryList(GetTravelItineraryListRequest request){
+ public static ListPage<List<TravelItinerary>> getTravelItineraryList(GetTravelItineraryListRequest request){
+ request.setScene("TRAFFIC");
+ request.setPartnerId("522700");
+
//请求路径
String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/getTravelItineraryList";
//私钥文件
@@ -294,7 +361,7 @@
TravelItinerary object = list.getObject(i, TravelItinerary.class);
travelItineraryList.add(object);
}
- ListPage listPage = new ListPage<TravelItinerary>();
+ ListPage listPage = new ListPage<List<TravelItinerary>>();
listPage.setTotal(total);
listPage.setPageNum(pageNum);
listPage.setPageSize(pageSize);
@@ -309,6 +376,25 @@
* @return
*/
public static TradeOrderCreate tradeOrderCreate1(TradeOrderCreateData tradeOrderCreateData) {
+ tradeOrderCreateData.setScene("TRAFFIC");
+ tradeOrderCreateData.setPartnerId("522700");
+ tradeOrderCreateData.setTimeout("72H");
+ tradeOrderCreateData.setOrderAppId("52270015");
+ tradeOrderCreateData.setChannelSource("GRJYCXWXXCX");
+ tradeOrderCreateData.setPayPartnerId("5400004");
+ tradeOrderCreateData.setCurrency("RMB");
+ tradeOrderCreateData.setNeedLoginFlag("N");
+ tradeOrderCreateData.setAccessMode("APP");
+ tradeOrderCreateData.getGoodsInfo().forEach(goodsInfoRequest->{
+ goodsInfoRequest.setId("981100006005901");
+ goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
+ goodsInfoRequest.setProfitSharing("1");
+ goodsInfoRequest.setAreaInfo("520100");
+ goodsInfoRequest.setPayType("0");
+ goodsInfoRequest.setBusinessType("10408");
+ });
+
+
TradeRequest request = new TradeRequest<TradeOrderCreateData>();
request.setSceneId("1945688132719169536");
request.setAppId(QianYunTongProperties.appkey);
@@ -356,6 +442,11 @@
* @return
*/
public static OrderInfo tradeOrderCreate(CreateOrderRequest createOrderRequest) {
+ createOrderRequest.setOrderAppId("52270015");
+ createOrderRequest.setScene("TRAFFIC");
+ createOrderRequest.setPartnerId("522700");
+ createOrderRequest.setChannelSource("GRJYCXWXXCX");
+
TradeRequest request = new TradeRequest<CreateOrderRequest>();
request.setSceneId(QianYunTongProperties.sceneId);
request.setAppId(QianYunTongProperties.appkey);
@@ -403,8 +494,31 @@
* @return
*/
public static PayInfo tradePayOff(TradePayOffData tradePayOffData) {
+ tradePayOffData.setPartnerId("5400004");
+ tradePayOffData.setTimeout("72H");
+ tradePayOffData.setScene("TRAFFIC");
+ tradePayOffData.setCurrency("RMB");
+ tradePayOffData.setRetUrl("");
+ tradePayOffData.setClientIp(System.getProperty("http.remoteAddr"));
+ tradePayOffData.setNeedLoginFlag("N");
+ 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(":B00000872");
+ goodsInfo1.setCustId("CB0000004686");
+ goodsInfo1.setCustName("证联消费平台交易客户");
+ goodsInfo1.setProfitSharing("1");
+ goodsInfo.add(goodsInfo1);
+ tradePayOffData.setGoodsInfo(goodsInfo);
+
+
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