开发：订单列表增加用车需求

performance-api/src/main/java/com/clx/order/params/OrderGoodsChildParams.java

@@ -6,6 +6,7 @@ import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Getter
 @Setter
@@ -43,12 +44,15 @@ public class OrderGoodsChildParams {
     private String seniorLogisticsManagerName;
 
 
-    @ApiModelProperty(value = "定向运单失效时间", example = "2023-09-09 12:00:01", required = true)
-    private String directionalExpireTime;
+//    @ApiModelProperty(value = "定向运单失效时间", example = "2023-09-09 12:00:01", required = true)
+//    private String directionalExpireTime;
 
     @ApiModelProperty("创建人用户编号")
     private Long userNo;
 
     @ApiModelProperty("创建人姓名")
     private String userName;
+
+    @ApiModelProperty("车辆列表")
+    private List<String> trackList;
 }

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -128,9 +128,9 @@ public class GoodsOrderController {
 
                     orderGoods.setLastArriveSendTime(DateUtils.parseDateTime(child.getLastArriveSendTime()).get());
                     //定向运单失效时间
-                    orderGoods.setDirectionalExpireTime(DateUtils.parseDateTime(child.getDirectionalExpireTime()).get());
-                    orderGoods.setSeniorLogisticsManagerId(child.getSeniorLogisticsManagerId());
-                    orderGoods.setSeniorLogisticsManagerName(child.getSeniorLogisticsManagerName());
+//                    orderGoods.setDirectionalExpireTime(DateUtils.parseDateTime(child.getDirectionalExpireTime()).get());
+//                    orderGoods.setSeniorLogisticsManagerId(child.getSeniorLogisticsManagerId());
+//                    orderGoods.setSeniorLogisticsManagerName(child.getSeniorLogisticsManagerName());
 
                     orderGoods.setOrderNo(orderNo);
                     orderGoods.setOrderGoodsType(OrderGoodsTypeEnum.Status.PLATFORM.getCode());
@@ -192,9 +192,9 @@ public class GoodsOrderController {
 
                     orderGoods.setLastArriveSendTime(DateUtils.parseDateTime(child.getLastArriveSendTime()).get());
                     //定向运单失效时间
-                    orderGoods.setDirectionalExpireTime(DateUtils.parseDateTime(child.getDirectionalExpireTime()).get());
-                    orderGoods.setSeniorLogisticsManagerId(child.getSeniorLogisticsManagerId());
-                    orderGoods.setSeniorLogisticsManagerName(child.getSeniorLogisticsManagerName());
+//                    orderGoods.setDirectionalExpireTime(DateUtils.parseDateTime(child.getDirectionalExpireTime()).get());
+//                    orderGoods.setSeniorLogisticsManagerId(child.getSeniorLogisticsManagerId());
+//                    orderGoods.setSeniorLogisticsManagerName(child.getSeniorLogisticsManagerName());
 
                     orderGoods.setOrderNo(orderNo);
                     orderGoods.setOrderGoodsType(OrderGoodsTypeEnum.Status.PLATFORM.getCode());

performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDriverTruckListener.java

+//package com.clx.performance.listener;
+//
+//import com.clx.performance.constant.RabbitKeyConstants;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.stereotype.Component;
+//
+//@Component
+//@Slf4j
+//public class OrderGoodsDriverTruckListener {
+//
+//
+//    @RabbitListener(queues = RabbitKeyConstants.ORDER_ON_DEAD_QUEUE)
+//    public void onMessage(String message) throws Exception {
+//        log.info("处理订单状态由已挂单变为挂弹中监听器执行,订单ID为{}", message);
+//        if (StringUtils.isBlank(message)) {
+//            return;
+//        }
+//        OrderInfo orderInfo = orderInfoDao.getByOrderNo(message);
+//        if (orderInfo == null) {
+//            log.info("处理订单状态由已挂单变为挂弹中监听器未查询到订单数据,消息为{}", message);
+//            return;
+//        }
+//        if (OrderEnum.Status.POST_ORDER.getCode().equals(orderInfo.getOrderStatus())) {
+//            log.info("处理订单状态由已挂单变为挂单中监听器执行,从状态{}-----变更为{}", OrderEnum.Status.POST_ORDER.getName(), OrderEnum.Status.ON_ORDER.getName());
+//            orderInfoDao.updateOrderStatusById(orderInfo.getId(), OrderEnum.Status.ON_ORDER.getCode());
+//        }
+//    }
+//}