配送进程

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1132,14 +1132,18 @@ public class OrderServiceImpl implements Orderservice {
         responseVo.setOperationList(operationList);
         responseVo.setOrderId(orderBean.getOid());
         responseVo.setStorePhone(deliveryBaseResponse.getData().getStorePhone());
-        String currentPoint[] = deliveryBaseResponse.getData().getCurrentPoint().split(",");
-        String storePoint[] = deliveryBaseResponse.getData().getStorePoint().split(",");
-        responseVo.setRiderLongitude(currentPoint[0]);
-        responseVo.setRiderLatitude(currentPoint[1]);
+        if(deliveryBaseResponse.getData().getCurrentPoint() != null){
+            String currentPoint[] = deliveryBaseResponse.getData().getCurrentPoint().split(",");
+            responseVo.setRiderLongitude(currentPoint[0]);
+            responseVo.setRiderLatitude(currentPoint[1]);
+        }
+        if(deliveryBaseResponse.getData().getStorePoint() != null){
+            String storePoint[] = deliveryBaseResponse.getData().getStorePoint().split(",");
+            responseVo.setShopLongitude(storePoint[0]);
+            responseVo.setShopLatitude(storePoint[1]);
+        }
         responseVo.setUserLongitude(String.valueOf(orderBean.getLongitude()));
         responseVo.setUserLatitude(String.valueOf(orderBean.getLatitude()));
-        responseVo.setShopLongitude(storePoint[0]);
-        responseVo.setShopLatitude(storePoint[1]);
         responseVo.setDistance(deliveryBaseResponse.getData().getDistance());
         responseVo.setDeliveryId(deliveryBaseResponse.getData().getDeliveryId());
         responseVo.setDevlieryStatus(deliveryBaseResponse.getData().getDevlieryStatus());