From 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 16 五月 2025 10:27:41 +0800
Subject: [PATCH] 修改文档bug

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java |   51 +++++++++++++++++++++------------------------------
 1 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
index 25df7aa..2be1959 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
@@ -17,12 +17,11 @@
 import com.stylefeng.guns.modular.system.util.PushURL;
 import com.stylefeng.guns.modular.system.util.ResultUtil;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.ui.Model;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.io.BufferedReader;
@@ -60,6 +59,20 @@
 
     @Value("${filePath}")
     private String filePath;
+    @Autowired
+    private ITDriverService tDriverService;
+    @Resource
+    private LineShiftDriverMapper lineShiftDriverMapper;
+    @Autowired
+    private ITUserService userService;
+    @Autowired
+    private ITransactionDetailsService transactionDetailsService;
+    @Autowired
+    private IPaymentRecordService paymentRecordService;
+    @Resource
+    private OrderCancelMapper orderCancelMapper;
+    @Autowired
+    private IIncomeService incomeService;
 
     /**
      * 跳转到跨城出行订单首页
@@ -93,6 +106,9 @@
         model.addAttribute("tOrderCrossCityId",tOrderCrossCityId);
         return PREFIX + "tOrderCrossCity_track.html";
     }
+
+   /* @Autowired
+    private ICBCPayUtil icbcPayUtil;*/
 
     /**
      * 获取订单轨迹
@@ -161,33 +177,6 @@
         return super.packForBT(page);
     }
 
-    @Autowired
-    private ITDriverService tDriverService;
-
-    @Resource
-    private LineShiftDriverMapper lineShiftDriverMapper;
-
-    @Autowired
-    private ITUserService userService;
-
-    @Autowired
-    private ITransactionDetailsService transactionDetailsService;
-
-    @Autowired
-    private IPaymentRecordService paymentRecordService;
-
-   /* @Autowired
-    private ICBCPayUtil icbcPayUtil;*/
-
-    @Resource
-    private OrderCancelMapper orderCancelMapper;
-
-    @Autowired
-    private IIncomeService incomeService;
-
-
-
-
     /**
      * 取消跨城出行订单
      */
@@ -237,6 +226,7 @@
         Map<String,String> map = new HashMap<>();
         map.put("id", orderCrossCity.getId().toString());
         map.put("orderType", "3");
+        map.put("from", "admin");
         String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
         System.out.println("跨城出行取消:【orderId="+orderCrossCity.getId().toString()+"】,调用接口:"+result);
 
@@ -308,6 +298,7 @@
         Map<String,String> map1 = new HashMap<>();
         map1.put("id", tOrderCrossCity.getId().toString());
         map1.put("orderType", "3");
+        map1.put("from", "admin");
         String result1 = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map1);
         System.out.println("跨城出行取消:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result1);
 

--
Gitblit v1.7.1