From c2fdeb19b52f58a8ae8f7efdc26f16dff86569ef Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期六, 16 八月 2025 00:59:44 +0800
Subject: [PATCH] 抢单和改派
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
index 857133a..97f6b03 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
+++ b/UserOKTravel/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.OrderCrossCityWarpperPushOrder;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.SystemException;
@@ -84,6 +85,33 @@
}
}
+ /**
+ * 跨城出行下单操作(推单场景)
+ * @param orderCrossCityWarpperPushOrder
+ * @param request
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/api/orderCrossCity/orderCrossCityPushOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "跨城出行下单操作(推单场景)", tags = {"用户端-跨城"}, notes = "先进行下单操作，再根据返回的订单id进行支付")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<BaseWarpper> orderCrossCityPushOrder(OrderCrossCityWarpperPushOrder orderCrossCityWarpperPushOrder, HttpServletRequest request){
+ try {
+ Integer uid = userInfoService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ return orderCrossCityService.orderCrossCityPushOrder(orderCrossCityWarpperPushOrder, uid);
+ } catch (SystemException se){
+ return ResultUtil.error(se.getMessage());
+ } catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
/**
* 摆渡车下单
--
Gitblit v1.7.1