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

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

@@ -169,4 +169,11 @@ public interface TransportRemoteService {
      * 完结订单
      */
     Boolean logisticOrderFinish( OrderFinishParam req);
+
+    /**
+     * 获取物流订单列表
+     * @param param 订单列表参数
+     * @return 订单列表
+     */
+    List<KwtLogisticsOrderVO> getLogisticOrderList(OrderFinishParam param);
 }

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

@@ -997,8 +997,12 @@ public class TransportServiceImpl implements TransportRemoteService {
         kwtLogisticsOrderVO.setLossUnit(logOrder.getLossUnit());
         kwtLogisticsOrderVO.setGoodsPrice(logOrder.getGoodsPrice());
         kwtLogisticsOrderVO.setGoodsPriceUnit(logOrder.getGoodsPriceUnit());
-        kwtLogisticsOrderVO.setStartTime(Date.from(logOrder.getStartTime().atZone(ZoneId.systemDefault()).toInstant()));
-        kwtLogisticsOrderVO.setEntTime(Date.from(logOrder.getEndTime().atZone(ZoneId.systemDefault()).toInstant()));
+        if (logOrder.getStartTime() != null){
+            kwtLogisticsOrderVO.setStartTime(Date.from(logOrder.getStartTime().atZone(ZoneId.systemDefault()).toInstant()));
+        }
+        if (logOrder.getEndTime() != null){
+            kwtLogisticsOrderVO.setEntTime(Date.from(logOrder.getEndTime().atZone(ZoneId.systemDefault()).toInstant()));
+        }
         kwtLogisticsOrderVO.setSubcontractAmount(logOrder.getSubcontractAmount());
         kwtLogisticsOrderVO.setEntrustAmount(logOrder.getEntrustAmount());
         kwtLogisticsOrderVO.setUnloadAmount(logOrder.getUnloadAmount());
@@ -1110,6 +1114,21 @@ public class TransportServiceImpl implements TransportRemoteService {
 
     }
 
+    @Override
+    public List<KwtLogisticsOrderVO> getLogisticOrderList(OrderFinishParam param) {
+        if(Objects.isNull(param.getTradeOrderId())){
+            throw new BusinessException("贸易订单id不能为空");
+        }
+        List<KwtLogisticsOrder> kwtLogisticsOrders = logisticsOrderRepository.queryByTradeOrderId(param.getTradeOrderId());
+        if (CollectionUtils.isEmpty(kwtLogisticsOrders)){
+            return List.of();
+        }
+        return kwtLogisticsOrders.stream()
+                .map(TransportServiceImpl::getLogisticsOrderVo)
+                .collect(Collectors.toList());
+
+    }
+
     @NotNull
     private static AddLogisticOrderDTO getAddLogisticOrderDTO(AddLogisticOrderParam param) {
         AddLogisticOrderDTO addLogisticOrderDTO = new AddLogisticOrderDTO();