提交新增合同文件校验

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

@@ -1228,6 +1228,10 @@ public class TransportServiceImpl implements TransportRemoteService {
         addLogisticOrderDTO.setUnLoadDetailAddress(param.getUnLoadDetailAddress());
         addLogisticOrderDTO.setUnloadContacts(param.getUnloadContacts());
         addLogisticOrderDTO.setUnloadPhone(param.getUnloadPhone());
+        addLogisticOrderDTO.setLoadLat(param.getLoadLat());
+        addLogisticOrderDTO.setLoadLng(param.getLoadLng());
+        addLogisticOrderDTO.setUnloadLat(param.getUnloadLat());
+        addLogisticOrderDTO.setUnloadLng(param.getUnloadLng());
         return addLogisticOrderDTO;
     }
 

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

@@ -167,5 +167,27 @@ public class AddLogisticOrderDTO implements Serializable {
     @NotBlank(message = "卸货联系电话不能为空")
     private String unloadPhone;
 
+    /**
+     * 装货纬度
+     */
+    @NotBlank(message = "纬度不能为空")
+    private String loadLat;
+
+    /**
+     * 装货 经度
+     */
+    @NotBlank(message = "经度不能为空")
+    private String loadLng;
 
+    /**
+     * 卸货纬度
+     */
+    @NotBlank(message = "纬度不能为空")
+    private String unloadLat;
+
+    /**
+     * 卸货经度
+     */
+    @NotBlank(message = "经度不能为空")
+    private String unloadLng;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderDetailResp.java

@@ -166,6 +166,28 @@ public class WaybillOrderDetailResp implements Serializable {
     @Schema(description = "装卸货之间距离")
     private double distanceKm;
 
+    /**
+     * 装货地址经度
+     */
+    @Schema(description = "装货地址经度")
+    private String loadLongitude;
+    /**
+     * 装货地址纬度
+     */
+    @Schema(description = "装货地址纬度")
+    private String loadLatitude;
+
+    /**
+     * 卸货地址经度
+     */
+    @Schema(description = "卸货地址经度")
+    private String unloadLongitude;
+    /**
+     * 卸货地址纬度
+     */
+    @Schema(description = "卸货地址纬度")
+    private String unloadLatitude;
+
     /**
      * 过磅记录
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtAcceptCarriageOrderService.java

@@ -3382,6 +3382,8 @@ public class KwtAcceptCarriageOrderService {
         loadAddress.setEntryType(NumberConstant.FOUR);
         loadAddress.setStatus(NumberConstant.ZERO);
         loadAddress.setCreateBy(orderDTO.getUserId());
+        loadAddress.setLat(orderDTO.getLoadLat());
+        loadAddress.setLng(orderDTO.getLoadLng());
         Date date1 = new Date();
         loadAddress.setCreateTime(date1);
         loadAddress.setUpdateBy(orderDTO.getUserId());
@@ -3402,6 +3404,8 @@ public class KwtAcceptCarriageOrderService {
         unloadAddress.setStatus(NumberConstant.ZERO);
         unloadAddress.setSort(NumberConstant.ZERO);
         unloadAddress.setCreateBy(orderDTO.getUserId());
+        unloadAddress.setLat(orderDTO.getUnloadLat());
+        unloadAddress.setLng(orderDTO.getUnloadLng());
         unloadAddress.setCreateTime(date1);
         unloadAddress.setUpdateBy(orderDTO.getUserId());
         unloadAddress.setUpdateTime(date1);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -3423,6 +3423,10 @@ public class KwtWaybillOrderV1Service {
                 Optional.ofNullable(unLoadAdd.getLat()).map(Double::valueOf).orElse(null),
                 Optional.ofNullable(unLoadAdd.getLng()).map(Double::valueOf).orElse(null));
         waybillOrderDetailResp.setDistanceKm(distanceKm);
+        waybillOrderDetailResp.setLoadLatitude(loadAdd.getLat());
+        waybillOrderDetailResp.setLoadLongitude(loadAdd.getLng());
+        waybillOrderDetailResp.setUnloadLatitude(unLoadAdd.getLat());
+        waybillOrderDetailResp.setUnloadLongitude(unLoadAdd.getLng());
 
         waybillOrderDetailResp.setTaskVolume(Objects.nonNull(subtask.getEntrustAmount()) ?
                 subtask.getEntrustAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");