1、车辆运单确认/拒绝出车

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtWaybillOrderController.java

@@ -4,7 +4,7 @@ import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.model.ValiList;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.transport.model.dto.OperateDepartureDto;
+import com.sckw.transport.model.dto.OperateWaybillDto;
 import com.sckw.transport.model.dto.OperateSendCarDto;
 import com.sckw.transport.model.dto.SendCarDto1;
 import com.sckw.transport.model.dto.UpdateDriverCarDTO;
@@ -147,7 +147,7 @@ public class KwtWaybillOrderController {
      * @date 2023/7/26
      **/
     @PostMapping("/confirmDeparture")
-    public HttpResult confirmDeparture(@RequestBody @Valid OperateDepartureDto params){
+    public HttpResult confirmDeparture(@RequestBody @Valid OperateWaybillDto params){
         return waybillOrderService.confirmDeparture(params);
     }
 
@@ -158,7 +158,7 @@ public class KwtWaybillOrderController {
      * @date 2023/7/26
      **/
     @PostMapping("/refuseDeparture")
-    public HttpResult refuseDeparture(@RequestBody @Valid OperateDepartureDto params){
+    public HttpResult refuseDeparture(@RequestBody @Valid OperateWaybillDto params){
         return waybillOrderService.refuseDeparture(params);
     }
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/OperateDepartureDto.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/OperateWaybillDto.java

@@ -11,7 +11,7 @@ import lombok.Data;
  * @date 2023/7/26 0026
  */
 @Data
-public class OperateDepartureDto {
+public class OperateWaybillDto {
 
     /**
      * 车辆订单id

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderService.java

@@ -16,7 +16,7 @@ import com.sckw.mongo.model.SckwWaybillOrder;
 import com.sckw.stream.model.SckwBusSum;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
-import com.sckw.transport.model.dto.OperateDepartureDto;
+import com.sckw.transport.model.dto.OperateWaybillDto;
 import com.sckw.transport.model.dto.OperateSendCarDto;
 import com.sckw.transport.model.dto.SendCarDto1;
 import jakarta.annotation.Resource;
@@ -862,7 +862,7 @@ public class KwtWaybillOrderService {
      * @author zk
      * @date 2023/7/26
      **/
-    public HttpResult confirmDeparture(OperateDepartureDto params){
+    public HttpResult confirmDeparture(OperateWaybillDto params){
         /**数据校验**/
         KwtWaybillOrder order = waybillOrderDao.selectById(params.getWOrderId());
         if (order == null) {
@@ -910,7 +910,7 @@ public class KwtWaybillOrderService {
      * @author zk
      * @date 2023/7/26
      **/
-    public HttpResult refuseDeparture(OperateDepartureDto params){
+    public HttpResult refuseDeparture(OperateWaybillDto params){
         /**数据校验**/
         KwtWaybillOrder order = waybillOrderDao.selectById(params.getWOrderId());
         if (order == null) {
@@ -947,6 +947,12 @@ public class KwtWaybillOrderService {
         return HttpResult.ok("拒绝出车成功！");
     }
 
+    /**
+     * @param order 车辆运单信息
+     * @description 更新mongodb中车辆运单信息
+     * @author zk
+     * @date 2023/7/26
+     **/
     public void editSckwWaybillOrder(KwtWaybillOrder order){
         SckwWaybillOrder wOrder = new SckwWaybillOrder();
         wOrder.set_id(order.getId());
@@ -965,13 +971,19 @@ public class KwtWaybillOrderService {
         streamBridge.send("sckw-busSum", busSum);
     }
 
-    public void editSckwLogisticsOrder(KwtLogisticsOrder logisticsOrder){
+    /**
+     * @param order 承运订单
+     * @description 更新mongodb中承运订单信息
+     * @author zk
+     * @date 2023/7/26
+     **/
+    public void editSckwLogisticsOrder(KwtLogisticsOrder order){
         SckwLogisticsOrder lOrder = new SckwLogisticsOrder();
-        lOrder.set_id(logisticsOrder.getId());
-        lOrder.setLOrderId(logisticsOrder.getId());
-        lOrder.setEntrustAmount(logisticsOrder.getEntrustAmount());
-        lOrder.setUpdateTime(logisticsOrder.getUpdateTime());
-        lOrder.setUpdateBy(logisticsOrder.getUpdateBy());
+        lOrder.set_id(order.getId());
+        lOrder.setLOrderId(order.getId());
+        lOrder.setEntrustAmount(order.getEntrustAmount());
+        lOrder.setUpdateTime(order.getUpdateTime());
+        lOrder.setUpdateBy(order.getUpdateBy());
         //rabbitMq业务汇总数据发送/消费对象
         SckwBusSum busSum = new SckwBusSum();
         //业务汇总类型