接单判断

performance-api/src/main/java/com/clx/performance/param/app/OrderChildCheckParam.java

@@ -41,4 +41,10 @@ public class OrderChildCheckParam extends PositionParam {
 
     @ApiModelProperty("可卸车时间段结束")
     private String unloadEndTime;
+
+    @ApiModelProperty("可装车时间段开始")
+    private String loadBeginTime;
+
+    @ApiModelProperty("可装车时间段结束")
+    private String loadEndTime;
 }

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -211,4 +211,10 @@ public class OrderChildVO {
     @ApiModelProperty("可卸车时间段结束")
     private String unloadEndTime;
 
+    @ApiModelProperty("可装车时间段开始")
+    private String loadBeginTime;
+
+    @ApiModelProperty("可装车时间段结束")
+    private String loadEndTime;
+
 }
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java

@@ -138,4 +138,10 @@ public class OrderGoodsVO {
 
     @ApiModelProperty("可卸车时间段结束")
     private String unloadEndTime;
+
+    @ApiModelProperty("可装车时间段开始")
+    private String loadBeginTime;
+
+    @ApiModelProperty("可装车时间段结束")
+    private String loadEndTime;
 }
\ No newline at end of file

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

@@ -1403,6 +1403,8 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         result.setUnloadBeginTime(orderInfoFeign.getUnloadBeginTime());
         result.setUnloadEndTime(orderInfoFeign.getUnloadEndTime());
+        result.setLoadBeginTime(orderInfoFeign.getLoadBeginTime());
+        result.setLoadEndTime(orderInfoFeign.getLoadEndTime());
 
         //查询结算信息
         Optional<SettlementOwnerDetail> optional = settlementOwnerDetailDao.getByChildNo(childNo);
@@ -1496,8 +1498,8 @@ public class OrderChildServiceImpl implements OrderChildService {
 
             LocalDate localDate = localDateTime.toLocalDate();
 
-            String begin = localDate + " " + param.getUnloadBeginTime();
-            String end = localDate + " " + param.getUnloadEndTime();
+            String begin = localDate + " " + param.getLoadBeginTime();
+            String end = localDate + " " + param.getLoadEndTime();
             log.info("预计到达时间：{}，可以装货时间：{}，可以卸货时间：{}", localDateTime, begin, end);
             //可以装货时间
             LocalDateTime beginLocalDateTime = DateUtils.parseDateTime(begin).get();

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

@@ -139,6 +139,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         orderGoodsVO.setSendAddressAll(orderInfoFeign.getSendAddressAll());
         orderGoodsVO.setUnloadBeginTime(orderInfoFeign.getUnloadBeginTime());
         orderGoodsVO.setUnloadEndTime(orderInfoFeign.getUnloadEndTime());
+        orderGoodsVO.setLoadBeginTime(orderInfoFeign.getLoadBeginTime());
+        orderGoodsVO.setLoadEndTime(orderInfoFeign.getLoadEndTime());
         orderGoodsVO.setResidueTransportWeight(BigDecimal.ZERO.compareTo(orderGoodsVO.getResidueTransportWeight()) > 0 ? BigDecimal.ZERO : orderGoodsVO.getResidueTransportWeight());
         return orderGoodsVO;
     }