From a0afbd1e36f74cb521c4d51b08a54f6a1fe538f2 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 31 八月 2023 12:01:54 +0800
Subject: [PATCH] broker 司机端
---
src/main/java/com/stylefeng/guns/modular/system/controller/IndexController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/stylefeng/guns/modular/system/controller/IndexController.java b/src/main/java/com/stylefeng/guns/modular/system/controller/IndexController.java
index 9693dbf..6cc2d62 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/controller/IndexController.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/controller/IndexController.java
@@ -25,6 +25,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 控制器
@@ -95,6 +96,7 @@
eTime=date+" 23:59:59";
}
List<OrderInfoVo> list = orderService.getOrderListIndex(orderInfoVoPage,id,containerNo,sTime,eTime,type);
+ System.out.println(list);
return new SuccessTip(list);
}
@@ -110,7 +112,7 @@
@GetMapping(value = "/orderInfo")
@ResponseBody
public Object orderInfo(Long id,int driverId) {
- OrderDetailVo orderDetailVo = orderService.orderInfo(id,driverId);
+ Map<String, Object> orderDetailVo = orderService.orderInfo(id,driverId);
// 经纬度给上
return new SuccessTip(orderDetailVo);
}
@@ -262,21 +264,29 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(name = "id", value = "订单id", required = true, dataType = "Long"),
+ @ApiImplicitParam(name = "driverId", value = "driverId", required = true, dataType = "int"),
})
@GetMapping(value = "/nextStatus")
@ResponseBody
- public Object nextStatus( Long id) {
+ public Object nextStatus( Long id,int driverId) {
+ System.out.println(id);
+ System.out.println(driverId);
+ List<TOrder> orders = orderService.selectList(new EntityWrapper<TOrder>().eq("nowDriverId", driverId).ne("id",id));
+ if(orders.size()>0){
+ return new ErrorTip(5008,"Please complete the last order");
+ }
TOrder tOrder = orderService.selectById(id);
+ tOrder.setNowDriverId(driverId);
if(tOrder.getExamSite()!=null && tOrder.getType().equals("Live Unload")){
if(tOrder.getStatus().equals("0")){
tOrder.setStatus("2");
-
}else
if(tOrder.getStatus().equals("2")){
tOrder.setStatus("3");
}else
if(tOrder.getStatus().equals("3")){
tOrder.setStatus("4");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("4")){
tOrder.setStatus("12");
@@ -292,24 +302,29 @@
}else
if(tOrder.getStatus().equals("5")){
tOrder.setStatus("6");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("6")){
tOrder.setStatus("7");
}else
if(tOrder.getStatus().equals("7")){
tOrder.setStatus("8");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("8")){
tOrder.setStatus("9");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("9")){
tOrder.setStatus("10");
}else
if(tOrder.getStatus().equals("10")){
tOrder.setStatus("11");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("11")){
tOrder.setStatus("18");
+ tOrder.setNowDriverId(0);
tOrder.setOrderOkTime(new Date());
}
}else if(tOrder.getExamSite()==null && tOrder.getType().equals("Live Unload")){
@@ -321,30 +336,36 @@
}else
if(tOrder.getStatus().equals("3")){
tOrder.setStatus("4");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("4")){
tOrder.setStatus("5");
}else
if(tOrder.getStatus().equals("5")){
tOrder.setStatus("6");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("6")){
tOrder.setStatus("7");
}else
if(tOrder.getStatus().equals("7")){
tOrder.setStatus("8");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("8")){
tOrder.setStatus("9");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("9")){
tOrder.setStatus("10");
}else
if(tOrder.getStatus().equals("10")){
tOrder.setStatus("11");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("11")){
tOrder.setStatus("18");
+ tOrder.setNowDriverId(0);
tOrder.setOrderOkTime(new Date());
}
}else if(tOrder.getExamSite()!=null && !tOrder.getType().equals("Live Unload")){
@@ -356,6 +377,7 @@
}else
if(tOrder.getStatus().equals("3")){
tOrder.setStatus("4");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("4")){
tOrder.setStatus("12");
@@ -371,15 +393,18 @@
}else
if(tOrder.getStatus().equals("5")){
tOrder.setStatus("6");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("6")){
tOrder.setStatus("7");
}else
if(tOrder.getStatus().equals("7")){
tOrder.setStatus("8");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("8")){
tOrder.setStatus("9");
+ tOrder.setNowDriverId(0);
tOrder.setOrderOkTime(new Date());
}
}else {
@@ -391,21 +416,25 @@
}else
if(tOrder.getStatus().equals("3")){
tOrder.setStatus("4");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("4")){
tOrder.setStatus("5");
}else
if(tOrder.getStatus().equals("5")){
tOrder.setStatus("6");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("6")){
tOrder.setStatus("7");
}else
if(tOrder.getStatus().equals("7")){
tOrder.setStatus("8");
+ tOrder.setNowDriverId(0);
}else
if(tOrder.getStatus().equals("8")){
tOrder.setStatus("9");
+ tOrder.setNowDriverId(0);
tOrder.setOrderOkTime(new Date());
}
}
--
Gitblit v1.7.1