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 | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 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 5b1d0fa..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
@@ -237,10 +237,13 @@
/**
* 创建行程单
+ *
* @param request
* @return 行程单ID
*/
- public static String createTravelItinerary(CreateTravelItineraryRequest request){
+ public static String createTravelItinerary(CreateTravelItineraryRequest request) {
+ request.setScene("TRAFFIC");
+ request.setPartnerId("522700");
//请求路径
String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/createTravelItinerary";
//私钥文件
@@ -266,7 +269,7 @@
log.info("【创建行程单】请求结果:" + result);
JSONObject jsonObject = JSON.parseObject(result);
String resCode = jsonObject.getString("resCode");
- if(!"000000".equals(resCode)){
+ if (!"000000".equals(resCode)) {
log.error("【创建行程单】失败:" + jsonObject.getString("resMsg"));
throw new RuntimeException("【创建行程单】失败:" + jsonObject.getString("resMsg"));
}
@@ -274,12 +277,14 @@
}
-
/**
* 修改行程单
+ *
* @param request
*/
- public static Boolean modifyTravelItinerary(ModifyTravelItineraryRequest request){
+ public static Boolean modifyTravelItinerary(ModifyTravelItineraryRequest request) {
+ request.setScene("TRAFFIC");
+ request.setPartnerId("522700");
//请求路径
String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/modifyTravelItinerary";
//私钥文件
@@ -305,7 +310,7 @@
log.info("【修改行程单】请求结果:" + result);
JSONObject jsonObject = JSON.parseObject(result);
String resCode = jsonObject.getString("resCode");
- if(!"000000".equals(resCode)){
+ if (!"000000".equals(resCode)) {
log.error("【修改行程单】失败:" + jsonObject.getString("resMsg"));
throw new RuntimeException("【修改行程单】失败:" + jsonObject.getString("resMsg"));
}
@@ -315,10 +320,11 @@
/**
* 行程单列表查询
+ *
* @param request
* @return
*/
- public static ListPage<List<TravelItinerary>> getTravelItineraryList(GetTravelItineraryListRequest request){
+ public static ListPage<List<TravelItinerary>> getTravelItineraryList(GetTravelItineraryListRequest request) {
request.setScene("TRAFFIC");
request.setPartnerId("522700");
@@ -347,7 +353,7 @@
log.info("【行程单列表查询】请求结果:" + result);
JSONObject jsonObject = JSON.parseObject(result);
String resCode = jsonObject.getString("resCode");
- if(!"000000".equals(resCode)){
+ if (!"000000".equals(resCode)) {
log.error("【行程单列表查询】失败:" + jsonObject.getString("resMsg"));
throw new RuntimeException("【行程单列表查询】失败:" + jsonObject.getString("resMsg"));
}
@@ -385,7 +391,7 @@
tradeOrderCreateData.setCurrency("RMB");
tradeOrderCreateData.setNeedLoginFlag("N");
tradeOrderCreateData.setAccessMode("APP");
- tradeOrderCreateData.getGoodsInfo().forEach(goodsInfoRequest->{
+ tradeOrderCreateData.getGoodsInfo().forEach(goodsInfoRequest -> {
goodsInfoRequest.setId("981100006005901");
goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
goodsInfoRequest.setProfitSharing("1");
@@ -509,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");
@@ -520,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);
//请求路径
@@ -560,10 +566,13 @@
/**
* 查询支付单信息
+ *
* @param getPaymentInfoDataRequest
* @return
*/
- public static GetPaymentInfo paymentInfo(GetPaymentInfoDataRequest getPaymentInfoDataRequest){
+ public static GetPaymentInfo paymentInfo(GetPaymentInfoDataRequest getPaymentInfoDataRequest) {
+ getPaymentInfoDataRequest.setPartnerId("5400004");
+
GetPaymentInfoRequest request = new GetPaymentInfoRequest();
request.setRequstType("POST");
request.setBusType(1);
@@ -594,13 +603,13 @@
log.info("【查询支付单信息】请求结果:" + result);
JSONObject jsonObject = JSON.parseObject(result);
String resCode = jsonObject.getString("retCode");
- if(!"0".equals(resCode)){
+ if (!"0".equals(resCode)) {
log.error("【查询支付单信息】失败:" + jsonObject.getString("retMsg"));
throw new RuntimeException("【查询支付单信息】失败:" + jsonObject.getString("retMsg"));
}
JSONObject object = jsonObject.getJSONObject("object");
String retCode = object.getString("retCode");
- if(!"000000".equals(retCode)){
+ if (!"000000".equals(retCode)) {
log.error("【查询支付单信息】失败:" + jsonObject.getString("retMsg"));
throw new RuntimeException("【查询支付单信息】失败:" + jsonObject.getString("retMsg"));
}
@@ -611,10 +620,16 @@
/**
* （补偿单）支付成功通知
+ *
* @param request
* @return
*/
- public static OrderInfo paymentOrder(PaymentOrderRequest request){
+ 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";
//私钥文件
@@ -640,19 +655,13 @@
log.info("【（补偿单）支付成功通知】请求结果:" + result);
JSONObject jsonObject = JSON.parseObject(result);
String resCode = jsonObject.getString("resCode");
- if(!"0".equals(resCode)){
+ if (!"0".equals(resCode)) {
log.error("【（补偿单）支付成功通知】失败:" + jsonObject.getString("resMsg"));
throw new RuntimeException("【（补偿单）支付成功通知】失败:" + jsonObject.getString("resMsg"));
}
OrderInfo orderInfo = jsonObject.getObject("busiResp", OrderInfo.class);
return orderInfo;
}
-
-
-
-
-
-
}
--
Gitblit v1.7.1