xucaiqin 1 月之前
父节点
当前提交
112add8925

+ 1 - 1
sckw-gateway/src/main/java/com/sckw/gateway/pojo/HttpStatus.java

@@ -195,4 +195,4 @@ public class HttpStatus {
     public static final String DICT_EXISTS = "字典键值已存在,不可重复!";
     public static final String PL34 = "3PL和4PL不能同时注册!";
 
-}
+}

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

@@ -1,6 +1,5 @@
 package com.sckw.transport.api.model.param;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
@@ -10,7 +9,6 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.util.List;
 
 
@@ -131,6 +129,17 @@ public class AddLogisticOrderParam implements Serializable {
      */
     @NotBlank(message = "装货详细地址不能为空")
     private String loadDetailAddress;
+    /**
+     * 纬度
+     */
+    @NotBlank(message = "纬度不能为空")
+    private String loadLat;
+
+    /**
+     * 经度
+     */
+    @NotBlank(message = "经度不能为空")
+    private String loadLng;
 
     /**
      *卸货地址id
@@ -170,4 +179,15 @@ public class AddLogisticOrderParam implements Serializable {
      */
     @NotBlank(message = "卸货联系电话不能为空")
     private String unloadPhone;
+    /**
+     * 纬度
+     */
+    @NotBlank(message = "纬度不能为空")
+    private String unloadLat;
+
+    /**
+     * 经度
+     */
+    @NotBlank(message = "经度不能为空")
+    private String unloadLng;
 }

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

@@ -2439,6 +2439,8 @@ public class KwoTradeOrderService {
             addLogisticOrderParam.setLoadContacts(kwoTradeOrderAddress.getContacts());
             addLogisticOrderParam.setLoadPhone(kwoTradeOrderAddress.getPhone());
             addLogisticOrderParam.setLoadDetailAddress(kwoTradeOrderAddress.getDetailAddress());
+            addLogisticOrderParam.setLoadLat(kwoTradeOrderAddress.getLat());
+            addLogisticOrderParam.setLoadLng(kwoTradeOrderAddress.getLng());
         }
 
         List<KwoTradeOrderAddress> kwoTradeOrderAddresses2 = addressMap.get(String.valueOf(AddressTypeEnum.SHIPMENT.getCode()));
@@ -2451,6 +2453,8 @@ public class KwoTradeOrderService {
             addLogisticOrderParam.setUnLoadDetailAddress(unloadAddress.getDetailAddress());
             addLogisticOrderParam.setUnloadContacts(unloadAddress.getContacts());
             addLogisticOrderParam.setUnloadPhone(unloadAddress.getPhone());
+            addLogisticOrderParam.setUnloadLng(unloadAddress.getLng());
+            addLogisticOrderParam.setUnloadLat(unloadAddress.getLat());
         }
         addLogisticOrderParam.setEntId(LoginUserHolder.getEntId());
         addLogisticOrderParam.setUserId(LoginUserHolder.getUserId());