From 3cd30ccaeab2161102ac1f68c44b04747c62cc03 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 12 一月 2026 18:58:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
index a44ad1a..e9a680b 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
@@ -3,6 +3,7 @@
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
import com.stylefeng.guns.modular.crossCity.warpper.OrderCrossCityWarpper;
+import com.stylefeng.guns.modular.crossCity.warpper.ScanOrderDetailWarpper;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.SystemException;
@@ -151,4 +152,27 @@
}
+ /**
+ * 【202601】获取扫码下单详情
+ * @param lineShiftDriverId 司机排班记录ID
+ * @param otherFee 其他费用
+ * @return 扫码下单详情
+ */
+ @ResponseBody
+ @RequestMapping(value = "/api/orderCrossCity/queryScanOrderDetail", method = RequestMethod.POST)
+ @ApiOperation(value = "【202601】获取扫码下单详情", tags = {"用户端-跨城"}, notes = "根据扫码内容获取下单页面详情数据，包含司机信息、线路信息、站点信息等")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "司机排班记录ID", name = "lineShiftDriverId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "其他费用", name = "otherFee", required = false, dataType = "double")
+ })
+ public ResultUtil<ScanOrderDetailWarpper> queryScanOrderDetail(Integer lineShiftDriverId, Double otherFee) {
+ try {
+ return orderCrossCityService.queryScanOrderDetail(lineShiftDriverId, otherFee);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
}
--
Gitblit v1.7.1