Merge branch '202110090-修复会员价套餐购物车不展示标签问题-zhiwei.zha' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/impl/GradDeliveryServiceImpl.java

@@ -188,6 +188,10 @@ public class GradDeliveryServiceImpl extends AbstractDeliveryServiceImpl impleme
             QueryDeliveryDistanceRequest queryDistance = new QueryDeliveryDistanceRequest(Double.parseDouble(storeInfo.getLatitude()), Double.parseDouble(storeInfo.getLongitude()), Double.parseDouble(userLatitude), Double.parseDouble(userLongitude));
             QueryDeliveryDistanceResponseVo distanceResp = deliveryFeiginClient.queryDeliveryDistance(queryDistance);
             riderDistance = distanceResp.getData().getDistance();
+            if (null == riderDistance) {
+                //这里直接抛出异常，走catch流程，用直线距离代替骑行距离
+                throw new Exception("经纬度信息有误");
+            }
         } catch (Exception e) {
             Double lineDistance = LocationUtil.getDistance(Double.parseDouble(storeInfo.getLatitude()), Double.parseDouble(storeInfo.getLongitude()),
                     Double.parseDouble(userLatitude), Double.parseDouble(userLongitude));