Add support for capturing sender and receiver location coordinates in DTOs and V…

…O, and handle location data in order creation logic.

Add support for capturing sender and receiver location coordinates in DTOs and V…
…O, and handle location data in order creation logic.
shaofan
1 parent 97a8d0f6
Showing 3 changed files with 30 additions and 6 deletions
sl-express-ms-oms-domain/src/main/java/com/sl/ms/oms/dto/MailingSaveDTO.java
sl-express-ms-oms-service/src/main/java/com/sl/ms/oms/service/impl/OrderServiceImpl.java
sl-express-ms-web-customer/src/main/java/com/sl/ms/web/customer/vo/oms/MailingSaveVO.java
@@ -14,8 +14,12 @@ import java.time.LocalDateTime;
 public class MailingSaveDTO {
     @ApiModelProperty("发件方地址簿id")
     private Long sendAddress;
+    @ApiModelProperty("发件方地址经纬度")
+    private String sendLocation;
     @ApiModelProperty("收件方地址簿id")
     private Long receiptAddress;
+    @ApiModelProperty("收件方地址经纬度")
+    private String receiptLocation;
     @ApiModelProperty("取件时间")
     private LocalDateTime pickUpTime;
     @ApiModelProperty("取件方式")
@@ -85,6 +85,7 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
  
     /**
      * 下单
+     *
      * @param mailingSaveDTO 下单信息
      * @return 下单成功信息
      * @throws SLException
@@ -101,6 +102,12 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
  
         // 订单位置
         OrderLocationEntity orderLocation = buildOrderLocation(order);
+        if (StrUtil.isNotEmpty(mailingSaveDTO.getSendLocation())) {
+            orderLocation.setSendLocation(mailingSaveDTO.getSendLocation());
+        }
+        if (StrUtil.isNotEmpty(mailingSaveDTO.getReceiptLocation())) {
+            orderLocation.setReceiveLocation(mailingSaveDTO.getReceiptLocation());
+        }
         log.info("订单位置为：{}", orderLocation);
  
         // 计算运费
@@ -132,7 +139,8 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
  
     /**
      * 获取订单地址信息
-     * @param sendAddressId 发送地址ID
+     *
+     * @param sendAddressId    发送地址ID
      * @param receiptAddressId 接收地址ID
      * @return
      */
@@ -152,6 +160,7 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
  
     /**
      * 预估总价
+     *
      * @param mailingSaveDTO 下单信息
      * @return 运费预估信息
      */
@@ -170,8 +179,9 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
  
     /**
      * 运费计算
+     *
      * @param mailingSaveDTO 下单信息
-     * @param senderCityId 发送城市ID
+     * @param senderCityId   发送城市ID
      * @param receiverCityId 接收城市ID
      * @return 计算结果
      */
@@ -196,7 +206,8 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
  
     /**
      * 补充数据
-     * @param order 订单
+     *
+     * @param order         订单
      * @param orderLocation 订单位置
      */
     private void appendOtherInfo(OrderEntity order, OrderLocationEntity orderLocation) {
@@ -234,7 +245,7 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
      * 构建订单
      *
      * @param mailingSaveDTO 下单信息
-     * @param sendAddress 发送地址
+     * @param sendAddress    发送地址
      * @param receiptAddress 接收地址
      * @return
      */
@@ -310,6 +321,7 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
  
     /**
      * 合并地址
+     *
      * @param entity 订单
      * @return 地址
      */
@@ -326,6 +338,7 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
  
     /**
      * 合并地址
+     *
      * @param orderDTO 订单
      * @return 地址
      */
@@ -341,6 +354,7 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
  
     /**
      * 合并地址
+     *
      * @return 地址
      */
     private StringBuilder areaAddress(Long province, Long city, Long county) {
@@ -378,7 +392,7 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
         cargoEntity.setWeight(mailingSaveDTO.getTotalWeight());
  
         // 体积
-        BigDecimal volume = ObjectUtil.isEmpty(mailingSaveDTO.getTotalVolume())  ? new BigDecimal("0.0001") : mailingSaveDTO.getTotalVolume().divide(new BigDecimal("1000000.00"));
+        BigDecimal volume = ObjectUtil.isEmpty(mailingSaveDTO.getTotalVolume()) ? new BigDecimal("0.0001") : mailingSaveDTO.getTotalVolume().divide(new BigDecimal("1000000.00"));
         cargoEntity.setTotalVolume(volume);
         cargoEntity.setVolume(volume);
         return cargoEntity;
@@ -422,7 +436,7 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
     /**
      * 取件
      *
-     * @param orderEntity 订单
+     * @param orderEntity   订单
      * @param orderLocation 位置
      */
     private void noticeOrderStatusChange(OrderEntity orderEntity, OrderLocationEntity orderLocation) {
@@ -12,9 +12,15 @@ public class MailingSaveVO {
     @ApiModelProperty("发件方地址簿id")
     private Long sendAddress;
  
+    @ApiModelProperty("发件方地址经纬度")
+    private String sendLocation;
+
     @ApiModelProperty("收件方地址簿id")
     private Long receiptAddress;
  
+    @ApiModelProperty("收件方地址经纬度")
+    private String receiptLocation;
+
     @ApiModelProperty("取件时间")
     private String pickUpTime;