调整订单位置逻辑，新增根据发收件地址获取机构ID的功能

alexyang
1 parent a220cbdd
Showing 1 changed file with 56 additions and 6 deletions
sl-express-ms-oms-service/src/main/java/com/sl/ms/oms/service/impl/OrderServiceImpl.java
@@ -101,13 +101,13 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
         log.info("订单信息入库:{}", order);
         // 订单位置
-        OrderLocationEntity orderLocation = buildOrderLocation(order);
-        if (StrUtil.isNotEmpty(mailingSaveDTO.getSendLocation())) {
-            orderLocation.setSendLocation(mailingSaveDTO.getSendLocation());
-        }
-        if (StrUtil.isNotEmpty(mailingSaveDTO.getReceiptLocation())) {
-            orderLocation.setReceiveLocation(mailingSaveDTO.getReceiptLocation());
+        OrderLocationEntity orderLocation;
+        if (StrUtil.isNotEmpty(mailingSaveDTO.getSendLocation()) && StrUtil.isNotEmpty(mailingSaveDTO.getReceiptLocation())) {
+            orderLocation = buildOrderLocationWithMall(order, mailingSaveDTO.getSendLocation(), mailingSaveDTO.getReceiptLocation());
+        } else {
+            orderLocation = buildOrderLocation(order);
         }
+
         log.info("订单位置为：{}", orderLocation);
         // 计算运费
@@ -320,6 +320,27 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
     }
     /**
+     * 根据经纬度计算网点
+     *
+     * @param location 经纬度
+     */
+    private String getAgencyIdWithMall(String location) throws SLException {
+
+        log.info("地址和坐标-->" + location);
+
+        double lng = Double.parseDouble(location.split(",")[0]); // 经度
+        double lat = Double.parseDouble(location.split(",")[1]); // 纬度
+
+        List<ServiceScopeDTO> serviceScopeDTOS = agencyScopeFeign.queryListByLocation(1, lng, lat);
+        if (CollectionUtils.isEmpty(serviceScopeDTOS)) {
+            log.error("地址不在服务范围");
+            throw new SLException("地址不在服务范围");
+        }
+
+        return String.valueOf(serviceScopeDTOS.get(0).getBid());
+    }
+
+    /**
      * 合并地址
      *
      * @param entity 订单
@@ -434,6 +455,35 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
     }
     /**
+     * 根据发收件人地址获取起止机构ID 调用机构范围微服务(中瑞商城)
+     *
+     * @param order 订单
+     * @return 位置信息
+     */
+    private OrderLocationEntity buildOrderLocationWithMall(OrderEntity order, String sendLocation, String receiveAgentLocation) {
+        String sendAgentId = getAgencyIdWithMall(sendLocation);
+
+        String receiveAgentId = getAgencyIdWithMall(receiveAgentLocation);
+
+        // 线路规划逻辑耗时较长，影响下单接口响应时间 下单时暂不进行判断是否存在线路
+//        if (ObjectUtil.notEqual(sendAgentId, receiveAgentId)) {
+//            //根据起始机构规划运输路线
+//            TransportLineNodeDTO transportLineNodeDTO = this.transportLineFeign.queryPathByDispatchMethod(Long.parseLong(sendAgentId), Long.parseLong(receiveAgentId));
+//            if (ObjectUtil.isEmpty(transportLineNodeDTO) || CollUtil.isEmpty(transportLineNodeDTO.getNodeList())) {
+//                throw new SLException("暂不支持寄件收件地址，没有对应的路线");
+//            }
+//        }
+
+        OrderLocationEntity orderLocationEntity = new OrderLocationEntity();
+        orderLocationEntity.setOrderId(order.getId());
+        orderLocationEntity.setSendLocation(sendLocation);
+        orderLocationEntity.setSendAgentId(Long.parseLong(sendAgentId));
+        orderLocationEntity.setReceiveLocation(receiveAgentLocation);
+        orderLocationEntity.setReceiveAgentId(Long.parseLong(receiveAgentId));
+        return orderLocationEntity;
+    }
+
+    /**
      * 取件
      *
      * @param orderEntity   订单