From 0c9e25aff0133d05bdaca55d1369eb90342b0b05 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 24 五月 2023 08:55:04 +0800
Subject: [PATCH] broker 卡车公司端
---
src/main/java/com/stylefeng/guns/modular/system/controller/OrderController.java | 53 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/stylefeng/guns/modular/system/controller/OrderController.java b/src/main/java/com/stylefeng/guns/modular/system/controller/OrderController.java
index 07f6f9d..7c0c9d5 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/controller/OrderController.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/controller/OrderController.java
@@ -142,6 +142,17 @@
return new SuccessTip(orderInfo);
}
+ @ApiOperation(value = "订单详情--修改reference numbers",notes="订单详情--修改reference numbers")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ })
+ @PostMapping(value = "/updateReference")
+ @ResponseBody
+ public Object updateReference( TGoods tGoods) {
+ boolean b = goodsService.updateById(tGoods);
+ return new SuccessTip();
+ }
+
@Resource
private TTransportationService tTransportationService;
@@ -178,10 +189,12 @@
if(driverIdOne!=null){
driverIds.add(driverIdOne);
}
- List<TTransportation> tTransportations = tTransportationService.selectList(new EntityWrapper<TTransportation>().eq("order_id", orderId).in("driver_id", driverIds));
+ transportInfo.setShipmentDate(tOrder.getShipmentDate());
+ List<TTransportation> tTransportations = tTransportationService.selectList(new EntityWrapper<TTransportation>().eq("order_id", orderId).in("driver_id", driverIds).orderBy("type"));
for (TTransportation tDriver : tTransportations) {
OrderDriverInfo orderDriverInfo = new OrderDriverInfo();
orderDriverInfo.setId(tDriver.getId());
+ orderDriverInfo.setDriverId(tDriver.getDriverId());
if(tDriver.getId().equals(sDriverIdOne)&&tDriver.getType()==2){
orderDriverInfo.setPickUp(tDriver.getPickDate());
}
@@ -315,11 +328,14 @@
List<TTransportation> list = companySelectDriverDto.getList();
tOrder.setsDriverid(list.get(0).getDriverId());
tOrder.setsDriverIdOne(list.get(1).getDriverId());
- tOrder.seteDriverid(list.get(2).getDriverId());
- tOrder.seteDriverIdOne(list.get(3).getDriverId());
+ if(companySelectDriverDto.getStreetTurn()==1){
+ tOrder.seteDriverid(list.get(2).getDriverId());
+ tOrder.seteDriverIdOne(list.get(3).getDriverId());
+ }
tOrder.setTruckCompany(companySelectDriverDto.getTruckCompany());
tOrder.setPickupTimeTruck(companySelectDriverDto.getPickupTime());
tOrder.setStreetTurn(companySelectDriverDto.getStreetTurn());
+ companySelectDriverDto.getList().forEach(e->e.setOrderId(orderId));
// 添加司机信息
tTransportationService.insertBatch(companySelectDriverDto.getList());
// 更改订单信息
@@ -345,17 +361,20 @@
// 找出这个订单
TOrder tOrder = orderService.selectById(orderId);
List<TTransportation> list = companySelectDriverDto.getList();
+ list.forEach(e->e.setOrderId(companySelectDriverDto.getOrderId()));
tOrder.setsDriverid(list.get(0).getDriverId());
tOrder.setsDriverIdOne(list.get(1).getDriverId());
- tOrder.seteDriverid(list.get(2).getDriverId());
- tOrder.seteDriverIdOne(list.get(3).getDriverId());
+ if(companySelectDriverDto.getStreetTurn()==1){
+ tOrder.seteDriverid(list.get(2).getDriverId());
+ tOrder.seteDriverIdOne(list.get(3).getDriverId());
+ }
tOrder.setTruckCompany(companySelectDriverDto.getTruckCompany());
tOrder.setPickupTimeTruck(companySelectDriverDto.getPickupTime());
tOrder.setStreetTurn(companySelectDriverDto.getStreetTurn());
// 删除原来的司机信息
tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId));
// 添加新司机信息
- tTransportationService.insertBatch(companySelectDriverDto.getList());
+ tTransportationService.insertBatch(list);
// 更改订单信息
orderService.updateById(tOrder);
return new SuccessTip();
@@ -379,18 +398,19 @@
// 找出这个订单
TOrder tOrder = orderService.selectById(orderId);
TTransportation list = companySelectDriverSingleDto.getList();
+ list.setOrderId(companySelectDriverSingleDto.getOrderId());
Integer type = companySelectDriverSingleDto.getType();
if(type==1){
- tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId).eq("driver_id",tOrder.getsDriverid()));
+ tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId).eq("driver_id",tOrder.getsDriverid()).eq("type",1));
tOrder.setsDriverid(list.getDriverId());
}else if(type==2){
- tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId).eq("driver_id",tOrder.getsDriverIdOne()));
+ tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId).eq("driver_id",tOrder.getsDriverIdOne()).eq("type",2));
tOrder.setsDriverIdOne(list.getDriverId());
}else if(type==3){
- tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId).eq("driver_id",tOrder.geteDriverid()));
+ tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId).eq("driver_id",tOrder.geteDriverid()).eq("type",3));
tOrder.seteDriverid(list.getDriverId());
}else {
- tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId).eq("driver_id",tOrder.geteDriverIdOne()));
+ tTransportationService.delete(new EntityWrapper<TTransportation>().eq("order_id",orderId).eq("driver_id",tOrder.geteDriverIdOne()).eq("type",4));
tOrder.seteDriverIdOne(list.getDriverId());
}
tTransportationService.insert(list);
@@ -422,22 +442,22 @@
// 找出这个订单
TOrder tOrder = orderService.selectById(orderId);
Integer type = companyLocationDto.getType();
- if(type==1){
- TTransportation tTransportation = tTransportationService.selectOne(new EntityWrapper<TTransportation>().eq("order_id", orderId).eq("driver_id", tOrder.getsDriverIdOne()));
+ if(type==2){
+ TTransportation tTransportation = tTransportationService.selectOne(new EntityWrapper<TTransportation>().eq("order_id", orderId).eq("driver_id", tOrder.getsDriverIdOne()).eq("type",2));
if(tTransportation!=null){
Integer yardId = tTransportation.getYardId();
TYard tYard = yardService.selectById(yardId);
return new SuccessTip(tYard);
}
- }else if(type==2){
- TTransportation tTransportation = tTransportationService.selectOne(new EntityWrapper<TTransportation>().eq("order_id", orderId).eq("driver_id", tOrder.geteDriverid()));
+ }else if(type==3){
+ TTransportation tTransportation = tTransportationService.selectOne(new EntityWrapper<TTransportation>().eq("order_id", orderId).eq("driver_id", tOrder.geteDriverid()).eq("type",3));
if(tTransportation!=null) {
Integer yardId = tTransportation.getYardId();
TYard tYard = yardService.selectById(yardId);
return new SuccessTip(tYard);
}
- }else if(type==3){
- TTransportation tTransportation = tTransportationService.selectOne(new EntityWrapper<TTransportation>().eq("order_id", orderId).eq("driver_id", tOrder.geteDriverIdOne()));
+ }else if(type==4){
+ TTransportation tTransportation = tTransportationService.selectOne(new EntityWrapper<TTransportation>().eq("order_id", orderId).eq("driver_id", tOrder.geteDriverIdOne()).eq("type",4));
if(tTransportation!=null) {
Integer portId = tTransportation.getPortId();
TPort tPort = portService.selectById(portId);
@@ -624,7 +644,6 @@
TOrder tOrder = orderService.selectById(orderId);
// 根据订单获取报价
-
map.put("invoice",tOrder.getInvoiceNumber());
map.put("pickUpDate",tOrder.getShipmentDate());
map.put("returnDate",tOrder.getOrderOkTime());
--
Gitblit v1.7.1