Merge remote-tracking branch 'origin/v12.2_upgradeFunction_20240424' into test

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

@@ -210,4 +210,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/controller/app/AppDriverOrderChildController.java

@@ -34,7 +34,7 @@ public class AppDriverOrderChildController {
 
     @ApiOperation(value = "接单判断", notes = "<br>By:胡宇帆")
     @PostMapping("/getOrderChildCheck")
-    public Result<String> getOrderChildCheck(@RequestBody @Validated OrderChildCheckParam param) {
+    public Result<Integer> getOrderChildCheck(@RequestBody @Validated OrderChildCheckParam param) {
 
         return Result.ok(orderChildService.getOrderChildCheck(param));
     }

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -95,5 +95,5 @@ public interface OrderChildService {
 
     OrderChildVO getOwnerOrderChildInfo(String childNo);
 
-    String getOrderChildCheck(OrderChildCheckParam param);
+    Integer getOrderChildCheck(OrderChildCheckParam param);
 }

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

@@ -1407,6 +1407,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);
@@ -1474,7 +1476,16 @@ public class OrderChildServiceImpl implements OrderChildService {
     }
 
     @Override
-    public String getOrderChildCheck(OrderChildCheckParam param) {
+    public Integer getOrderChildCheck(OrderChildCheckParam param) {
+        try {
+            return check(param);
+        } catch (Exception e) {
+            log.info("接单判断弹窗错误,错误信息:{}", e.getMessage());
+            return 0;
+        }
+    }
+
+    private int check(OrderChildCheckParam param) {
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(param.getOrderGoodsNo()).get();
         BigDecimal sendLatitude = orderGoods.getSendLatitude();
         BigDecimal sendLongitude = orderGoods.getSendLongitude();
@@ -1489,7 +1500,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             BigDecimal[] location = truckLocationDTO.getLocation();
             longitude = location[0];
             latitude = location[1];
-            log.info("当前中交兴路获取司机车牌：{},相关位置信息：{}",param.getTruckNo(), JSONUtil.parse(truckLocationDTO));
+            log.info("当前中交兴路获取司机车牌：{},相关位置信息：{}", param.getTruckNo(), JSONUtil.parse(truckLocationDTO));
         }
 
         List<GdRouteDTO> route = gdService.getRoute(longitude, latitude, sendLongitude, sendLatitude);
@@ -1501,8 +1512,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();
@@ -1510,13 +1521,13 @@ public class OrderChildServiceImpl implements OrderChildService {
 
             if (localDateTime.isAfter(beginLocalDateTime) && localDateTime.isBefore(endLocalDateTime)) {
                 log.info("不用弹");
-                return "不用弹";
+                return 0;
             } else {
                 log.info("需要弹");
-                return "需要弹";
+                return 1;
             }
         }
-        return "不用弹,高德数据为空";
+        return 0;
     }
 
     //计算亏吨吨数

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;
     }