From 0efd2293074db0beeb8c74721f765190decb20bc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 21 七月 2025 18:47:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 3fca710..422f3e2 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -517,20 +517,22 @@
/**
* 批量订单
+ *
* @throws Exception
*/
@Override
- public ResultUtil<BaseWarpper> saveOrderPrivateCars(String serverCarModel, Date travelTime, Integer reservation, Integer instead, String placementLon, String placementLat, String startLon, String startLat, String startAddress, String endLon, String endLat, String endAddress, String name, String phone, Integer orderSource, Integer driverId, Integer uid, Integer peopleNum) throws Exception {
+ public ResultUtil<BaseWarpper> saveOrderPrivateCars(String serverCarModel, Date travelTime, Integer reservation, Integer instead, String placementLon, String placementLat, String startLon, String startLat, String startAddress, String endLon,
+ String endLat, String endAddress, String name, String phone, Integer orderSource, Integer driverId, Integer uid, Integer peopleNum) throws Exception {
BaseWarpper baseWarpper = new BaseWarpper();
if (lock.tryLock()) {
- try{
- //如果出行时间大于当前10分钟则默认为预约单
- if(travelTime.getTime() > (System.currentTimeMillis() + 600000)){
- reservation = 2;
- }
-
- /**
- * 1.出租车、专车、跨城有待支付的订单不能叫车
+ try {
+ //如果出行时间大于当前10分钟则默认为预约单
+ if (travelTime.getTime() > (System.currentTimeMillis() + 600000)) {
+ reservation = 2;
+ }
+
+ /**
+ * 1.出租车、专车、跨城有待支付的订单不能叫车
* 2.小件物流有未完成的订单可以下跨城、专车、出租车
* 3.出租车、专车、跨城有预约单可以下即时单
*/
--
Gitblit v1.7.1