From b9df7bf92ff83bc0ed7c28f54c892095ef276afc Mon Sep 17 00:00:00 2001
From: lishouyi <linlangsur163@163.com>
Date: 星期五, 26 五月 2023 10:25:38 +0800
Subject: [PATCH] 卡车公司:invoice数据回调接口端口的更改
---
src/main/java/com/stylefeng/guns/modular/system/controller/OrderController.java | 63 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 16 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..55c4960 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
@@ -3,10 +3,13 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.enums.FacilityCodeEnum;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.utils.TerminalInterfaceAcquisitionUtil;
import com.stylefeng.guns.modular.system.utils.tips.ErrorTip;
import com.stylefeng.guns.modular.system.utils.tips.SuccessTip;
+import com.stylefeng.guns.modular.system.warpper.TerminaleDataWarpper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -142,6 +145,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;
@@ -179,6 +193,8 @@
driverIds.add(driverIdOne);
}
List<TTransportation> tTransportations = tTransportationService.selectList(new EntityWrapper<TTransportation>().eq("order_id", orderId).in("driver_id", driverIds));
+ TerminaleDataWarpper terminalStatus = TerminalInterfaceAcquisitionUtil.getTerminalStatus("WFHU5080179", FacilityCodeEnum.USLAX.getMsg());
+
for (TTransportation tDriver : tTransportations) {
OrderDriverInfo orderDriverInfo = new OrderDriverInfo();
orderDriverInfo.setId(tDriver.getId());
@@ -198,7 +214,7 @@
orderDriverInfo.setChassiess(powerUnitsService.selectById(tDriver.getChassises()));
// TODO 第三方 目前不知道对接那个
- orderDriverInfo.setAppointmentNumber(null);
+ orderDriverInfo.setAppointmentNumber(terminalStatus.getAppointmentNumber());
orderDriverInfos.add(orderDriverInfo);
@@ -206,6 +222,14 @@
transportInfo.setTruckCompany(tOrder.getTruckCompany());
transportInfo.setPickupTime(tOrder.getPickupTimeTruck());
transportInfo.setStreetTurn(tOrder.getStreetTurn());
+
+ transportInfo.setLineHold(terminalStatus.getLineHold());
+ transportInfo.setCustomHold(terminalStatus.getCustomHold());
+ transportInfo.setPierpass(terminalStatus.getPierpass());
+ transportInfo.setCTF(terminalStatus.getCtf());
+ transportInfo.setClosedArea(terminalStatus.getClosedArea());
+ transportInfo.setLFD(terminalStatus.getLfd());
+
transportInfo.setList(orderDriverInfos);
Integer examSite = tOrder.getExamSite();
if(Objects.nonNull(examSite)){
@@ -315,11 +339,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 +372,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 +409,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 +453,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);
--
Gitblit v1.7.1