修改bug

Pu Zhibing

2025-08-08 79a2f6ba6f64369b8ce5af01a4ad4451c518b2de

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java

@@ -10,6 +10,8 @@
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import lombok.extern.slf4j.Slf4j;

import java.net.InetAddress;
import java.net.UnknownHostException;
import java.text.SimpleDateFormat;
import java.util.*;

@@ -26,19 +28,19 @@
//      CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
//      request.setScene("TRAFFIC");
//      request.setPartnerId("522700");
//      request.setOrderNo("01234567890");
//      request.setOrderNo("3456789012345678");
//      request.setCustomerId("11448156");
//      request.setDriverId("11448158");
//      request.setSupplierShopId("981100006005951");
//      request.setServiceType(1);
//      String travelItinerary = createTravelItinerary(request);
//      System.err.println(travelItinerary);//1950363840206753792
//      System.err.println(travelItinerary);//1951088602595872768
      
      //修改行程状态
//      ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
//      request.setScene("TRAFFIC");
//      request.setPartnerId("522700");
//      request.setOrderId("1950363840206753792");
//      request.setOrderId("1951088602595872768");
//      request.setStatus(7);
//      request.setDriverId("11448158");
//      request.setSupplierShopId("981100006005951");
@@ -53,11 +55,11 @@
//      tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"0\"}");
//      tradeOrderCreateData.setCharge(new BigDecimal("0.01"));
//      tradeOrderCreateData.setChannelSource("GRJYCXWXXCX");
//      tradeOrderCreateData.setOrderId("1950363840206753792");
//      tradeOrderCreateData.setOrderNo("01234567890");
//      tradeOrderCreateData.setOrderId("1951088602595872768");
//      tradeOrderCreateData.setOrderNo("3456789012345678");
//      tradeOrderCreateData.setCustomerId("11448156");
//      tradeOrderCreateData.setPayPartnerId("5400004");
//      tradeOrderCreateData.setPartnerPayId("1950363840206753792");
//      tradeOrderCreateData.setPartnerPayId("1951088602595872768");
//      tradeOrderCreateData.setCurrency("RMB");
//      tradeOrderCreateData.setTotalFee("1");
//      tradeOrderCreateData.setRetUrl("pages/advoad-city-search/advoad-message/electronic-wait-pay/electronic-wait-pay");
@@ -69,8 +71,8 @@
//      List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
//      GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
//      goodsInfoRequest.setId("981100006005901");
//      goodsInfoRequest.setSubAppId("wxcbad113185a243e1");
//      goodsInfoRequest.setSubOpenId("oVLur6yFtED8ruXBWUFKXjzXJ_BQ");
//      goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
//      goodsInfoRequest.setSubOpenId("oVLur61wBKJEO7QPR1dsmzS5TSfs");
//      goodsInfoRequest.setProfitSharing("1");
//      goodsInfoRequest.setAreaInfo("520100");
//      goodsInfoRequest.setPayType("0");
@@ -92,10 +94,10 @@
//      TradePayOff1Data tradePayOff1Data = new TradePayOff1Data();
//      tradePayOff1Data.setPartnerId("5400004");
//      tradePayOff1Data.setScene("TRAFFIC");
//      tradePayOff1Data.setPartnerPayId("1948685426689200128");
//      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("出行订单支付");
@@ -103,8 +105,8 @@
//      List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
//      GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
//      goodsInfoRequest.setId("981100006005901");
//      goodsInfoRequest.setSubAppId("wxcbad113185a243e1");
//      goodsInfoRequest.setSubOpenId("oVLur6yFtED8ruXBWUFKXjzXJ_BQ");
//      goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
//      goodsInfoRequest.setSubOpenId("oVLur61wBKJEO7QPR1dsmzS5TSfs");
//      goodsInfoRequest.setProfitSharing("1");
//      goodsInfoRequest.setAreaInfo("520100");
//      goodsInfoRequest.setPayType("0");
@@ -178,6 +180,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.setAreaInfo("520100");
         goodsInfoRequest.setPayType("0");
         goodsInfoRequest.setBusinessType("10408");
      });
		
		
      TradeRequest request = new TradeRequest<TradePayOff1Data>();
      request.setSceneId("1911676727023968256");
      request.setAppId(QianYunTongProperties.appkey);
@@ -220,14 +238,13 @@
   
   /**
    * 创建行程单
    *
    * @param request
    * @return 行程单ID
    */
   public static String createTravelItinerary(CreateTravelItineraryRequest request){
   public static String createTravelItinerary(CreateTravelItineraryRequest request) {
      request.setScene("TRAFFIC");
      request.setPartnerId("522700");
      request.setSupplierShopId("981100006005951");
      request.setServiceType(1);
      //请求路径
      String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/createTravelItinerary";
      //私钥文件
@@ -253,7 +270,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"));
      }
@@ -261,12 +278,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";
      //私钥文件
@@ -292,7 +311,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"));
      }
@@ -302,10 +321,14 @@
   
   /**
    * 行程单列表查询
    *
    * @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";
      //私钥文件
@@ -331,7 +354,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"));
      }
@@ -345,7 +368,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);
@@ -360,6 +383,24 @@
    * @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.setAreaInfo("520100");
         goodsInfoRequest.setPayType("0");
         goodsInfoRequest.setBusinessType("10408");
      });
		
		
      TradeRequest request = new TradeRequest<TradeOrderCreateData>();
      request.setSceneId("1945688132719169536");
      request.setAppId(QianYunTongProperties.appkey);
@@ -407,6 +448,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);
@@ -454,10 +500,45 @@
    * @return
    */
   public static PayInfo tradePayOff(TradePayOffData tradePayOffData) {
      tradePayOffData.setPartnerId("5400005");
      tradePayOffData.setTimeout("72H");
      tradePayOffData.setScene("TRAFFIC");
      tradePayOffData.setCurrency("RMB");
      tradePayOffData.setRetUrl("");
      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<>();
      PaymentInfoRequest paymentInfoRequest = new PaymentInfoRequest();
      paymentInfoRequest.setPayModeId("501212");
      paymentInfoRequest.setRealFee(tradePayOffData.getTotalFee().toString());
      paymentInfoRequest.setTradeFee(tradePayOffData.getTotalFee().toString());
      paymentInfoRequest.setAccountTyp("501");
      paymentInfoRequests.add(paymentInfoRequest);
      tradePayOffData.setPaymentInfos(paymentInfoRequests);
      List<GoodsInfo> goodsInfo = new ArrayList<>();
      GoodsInfo goodsInfo1 = new GoodsInfo();
      goodsInfo1.setMerchantCode("B00000905");
      goodsInfo1.setCustId("CB0000004686");
      goodsInfo1.setCustName("证联消费平台交易客户");
      goodsInfo1.setBusinessType("10408");
      goodsInfo1.setAgreementNo("00000000468618354161754464398681");
      goodsInfo1.setProfitSharing("1");
      goodsInfo.add(goodsInfo1);
      tradePayOffData.setGoodsInfo(goodsInfo);
		
		
      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);
      //请求路径
@@ -497,10 +578,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);
@@ -531,13 +615,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"));
      }
@@ -548,10 +632,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";
      //私钥文件
@@ -577,19 +667,13 @@
      log.info("【（补偿单）支付成功通知】请求结果:" + result);
      JSONObject jsonObject = JSON.parseObject(result);
      String resCode = jsonObject.getString("resCode");
      if(!"0".equals(resCode)){
      if (!"000000".equals(resCode)) {
         log.error("【（补偿单）支付成功通知】失败:" + jsonObject.getString("resMsg"));
         throw new RuntimeException("【（补偿单）支付成功通知】失败:" + jsonObject.getString("resMsg"));
      }
      OrderInfo orderInfo = jsonObject.getObject("busiResp", OrderInfo.class);
      return orderInfo;
   }
	
	
	
	
	
	
   
   
}