Merge remote-tracking branch 'origin/dev_20260131' into dev_20260131

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/dubbo/TransportRemoteStatisticsService.java

@@ -48,10 +48,10 @@ public interface TransportRemoteStatisticsService {
     /**
      * 统计贸易订单已派车次，排除已取消运单。
      *
-     * @param tradeOrderId 贸易订单ID
+     * @param tOrderId 贸易订单ID
      * @return 已派车次数
      */
-    Long countDispatchedWaybillsByTradeOrderId(Long tradeOrderId);
+    Long countDispatchedWaybillsByTradeOrderId(Long tOrderId);
 
     /**
      * 按时间范围汇总贸易订单已完成运单的完成量。

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/param/AddLogisticOrderParam.java

@@ -233,14 +233,14 @@ public class AddLogisticOrderParam implements Serializable {
      * 计划卸货时间
      */
     @NotNull(message = "计划卸货时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDate endTime;
 
     /**
      * 计划发货时间
      */
     @NotNull(message = "计划发货时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDate startTime;
 
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/DriverAssociatedTruckSaveRequest.java

@@ -42,7 +42,6 @@ public class DriverAssociatedTruckSaveRequest implements Serializable {
     private Integer energyType;
 
     @Schema(description = "排放标准")
-    @NotNull(message = "排放标准不能为空")
     private Integer eev;
 
     @Schema(description = "货车行驶证")

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -141,7 +141,7 @@ public class KwoTradeOrderService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private TransportRemoteService transportRemoteService;
 
-    @DubboReference(version = "1.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     private TransportRemoteStatisticsService transportRemoteStatisticsService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportStatisticsServiceImpl.java

@@ -147,15 +147,15 @@ public class TransportStatisticsServiceImpl implements TransportRemoteStatistics
     /**
      * 统计贸易订单已派车次。
      *
-     * @param tradeOrderId 贸易订单ID
+     * @param tOrderId 贸易订单ID
      * @return 已派车次数
      */
     @Override
-    public Long countDispatchedWaybillsByTradeOrderId(Long tradeOrderId) {
-        if (Objects.isNull(tradeOrderId)) {
+    public Long countDispatchedWaybillsByTradeOrderId(Long tOrderId) {
+        if (Objects.isNull(tOrderId)) {
             throw new BusinessException("贸易订单ID不能为空");
         }
-        List<Long> logisticsOrderIds = listLogisticsOrderIdsByTradeOrderId(tradeOrderId);
+        List<Long> logisticsOrderIds = listLogisticsOrderIdsByTradeOrderId(tOrderId);
         if (CollectionUtils.isEmpty(logisticsOrderIds)) {
             return 0L;
         }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/AddLogisticOrderDTO.java

@@ -231,14 +231,14 @@ public class AddLogisticOrderDTO implements Serializable {
      * 计划卸货时间
      */
     @NotNull(message = "计划卸货时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDate endTime;
 
     /**
      * 计划发货时间
      */
     @NotNull(message = "计划发货时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDate startTime;
 
     /**