Переглянути джерело

提交新增合同文件校验

chenxiaofei 1 місяць тому
батько
коміт
ee2c4f1688

+ 4 - 2
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -2541,15 +2541,16 @@ public class KwtLogisticsConsignmentService {
         setPerformInfo(logisticsOrder, waybillOrderSubtasks, logisticsOrderDetailResp);
 
         //设置物流信息
-        setLogisticInfo(logisticsOrder);
+        setLogisticInfo(logisticsOrder,logisticsOrderDetailResp);
 
         return logisticsOrderDetailResp;
     }
 
-    private static void setLogisticInfo(KwtLogisticsOrder logisticsOrder) {
+    private static void setLogisticInfo(KwtLogisticsOrder logisticsOrder,LogisticsOrderDetailResp logisticsOrderDetailResp) {
         LogisticsOrderDetailResp.LogisticOrderInfo logisticOrderInfo = new LogisticsOrderDetailResp.LogisticOrderInfo();
         logisticOrderInfo.setStartTime(DateUtils.format(logisticsOrder.getStartTime(),DateUtils.FORMAT9));
         logisticOrderInfo.setEndTime(DateUtils.format(logisticsOrder.getEndTime(),DateUtils.FORMAT9));
+        logisticsOrderDetailResp.setLogisticOrderInfo(logisticOrderInfo);
     }
 
     private static void setPerformInfo(KwtLogisticsOrder logisticsOrder, List<KwtWaybillOrderSubtask> waybillOrderSubtasks, LogisticsOrderDetailResp logisticsOrderDetailResp) {
@@ -2607,6 +2608,7 @@ public class KwtLogisticsConsignmentService {
                 Optional.ofNullable(loadAdd.getLng()).map(Double::valueOf).orElse(null),
                 Optional.ofNullable(unloadAdd.getLat()).map(Double::valueOf).orElse(null),
                 Optional.ofNullable(unloadAdd.getLng()).map(Double::valueOf).orElse(null));
+        loadingInfoVO.setReferenceDistance(String.valueOf(distanceKm));
         logisticsOrderDetailResp.setLoadingInfoVO(loadingInfoVO);
     }