Merge remote-tracking branch 'origin/v18.6_youhua_20240701' into dev

performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java

@@ -44,10 +44,10 @@ public class TempController {
     @Autowired
     private OrderChildDtsListener orderChildDtsListener;
 
-
     @Autowired
     private OrderChildService orderChildService;
 
+
     @ApiOperation(value = "test", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/test", method = RequestMethod.GET)
     public Result test() {
@@ -71,7 +71,6 @@ public class TempController {
         return Result.ok();
     }
 
-
     @ApiOperation(value = "插入缓存运单预计时间", notes = "<br>By:刘海泉")
     @RequestMapping(value = "/saveOrderChildExpectTime", method = RequestMethod.GET)
     public Result<Void> saveOrderChildExpectTime(@RequestParam("childNo") @NotBlank(message = "运单号不能为空") String childNo,

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

@@ -105,6 +105,5 @@ public interface OrderChildService {
 
     List<OrderChildExpectDTO> getOrderChildExpect(String orderChildNo);
 
-
-    void cacheOrderChildExpectData(String orderChildNo, OrderChildExpectDTO expect);
+    void cacheOrderChildExpectData(String childNo, OrderChildExpectDTO expect);
 }

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

@@ -2534,6 +2534,7 @@ public class OrderChildServiceImpl implements OrderChildService {
      * @Description 缓存实时计算的运单预计时间
      * @Param [orderChildNo, expect]
      **/
+    @Override
     public void cacheOrderChildExpectData(String orderChildNo, OrderChildExpectDTO expect) {
         log.info("放入缓存运单预计时间，运单号:{},预计数据:{}",orderChildNo, JSON.toJSONString(expect));
         String orderChildExpectDataKey = getOrderChildExpectDataKey(orderChildNo);