接单车型限制

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -42,7 +42,7 @@ public enum PerformanceResultEnum implements ResultEnum {
     ORDER_CHILD_STATUS_CHANGED(1302, "运单状态已变更，请重新刷新页面"),
     ORDER_CHILD_CANCELED(1303, "运单状态已取消"),
     ORDER_CHILD_COMPLETE(1304, "运单状态已完成"),
-    ORDER_CHILD_LOAD_TIMEOUT(1305, "超过装货截止时间"),
+    ORDER_CHILD_LOAD_TIMEOUT(1305, "超过最晚到达货源地时间"),
     ORDER_CHILD_CANCEL_FORBID(1306, "运单无法取消"),
     ORDER_CHILD_CANCEL_FORBID_COUNT(1307, "今日取消运单次数超过上限，暂时无法取消"),
     ORDER_CHILD_POUND_AUDIT(1308, "磅单审核中"),
@@ -50,6 +50,7 @@ public enum PerformanceResultEnum implements ResultEnum {
     ORDER_CHILD_DIRECT_ORDER_TRUCK_ERROR(1310, "请选择定向车辆"),
     ORDER_CHILD_DIRECT_ORDER_TRUCK_ERROR1(1311, "请选择非定向车辆"),
     ORDER_CHILD_DIRECT_REJECT_TRUCK_ERROR(1312, "非定向车辆无法取消"),
+    ORDER_CHILD_TRUCK_MODEL_ERROR(1312, "请选择合适的车型"),
 
     ORDER_CHILD_LOAD_WEIGHT_ERROR(1312, "装货净重超过载重的1.5倍"),
     ORDER_CHILD_UNLOAD_WEIGHT_ERROR(1313, "卸货净重超过载重的1.5倍"),

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

 package com.clx.performance.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.vo.feign.FeignAddressVO;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
@@ -32,6 +34,7 @@ import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -108,6 +111,16 @@ public class OrderChildServiceImpl implements OrderChildService {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_INVALID);
         }
 
+        // 车型限制
+        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        if (StringUtils.isNotBlank(orderInfo.getTruckModelList())){
+            List<JSONObject> truckModelList = JSON.parseArray(orderInfo.getTruckModelList(), JSONObject.class);
+            List<String> truckModelNameList = truckModelList.stream().map(item -> item.getString("truckModelName")).collect(Collectors.toList());
+            if (!truckModelNameList.contains(driverTruckInfo.getModel())){
+                throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_TRUCK_MODEL_ERROR);
+            }
+        }
+
         // 定向
         OrderGoodsTruckBind orderGoodsTruckBind = orderGoodsTruckBindDao.getValidByOrderGoodsNoAndTruckNo(truckNo).orNull();
         if (Objects.equals(orderGoods.getPendingOrderWay(), OrderGoodsPendingOrderWayStatusEnum.Status.EXCLUSIVE.getCode())){
@@ -370,11 +383,6 @@ public class OrderChildServiceImpl implements OrderChildService {
     private void updateLoadFirst(OrderChildLoadParam param, OrderChild orderChild, OrderGoods orderGoods) {
         String childNo = param.getChildNo();
 
-        // 装货超时
-        if (orderChild.getLoadDeadline().isBefore(LocalDateTime.now())){
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_TIMEOUT);
-        }
-
         // 装车时间验证
         FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderChild.getOrderNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         LocalDateTime now = LocalDateTime.now();