Merge remote-tracking branch 'remotes/origin/feature/fix-经纬度'

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1034,17 +1034,14 @@ public class OrderAdapter {
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
             responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
             responseVo.setPayChannel(ordersBean.getPayChannel());
-            if (ordersBean.getPayChannel() != null) {
+            if (StringUtils.isNotBlank(ordersBean.getPayChannel())) {
                 if ("10102".equals(ordersBean.getPayChannel())) {
                     responseVo.setOrderPayType("储值卡支付");
-                }
-                else if (PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
+                } else if (PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
                     responseVo.setOrderPayType("支付宝支付");
-                }
-                else if (PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
+                } else if (PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
                     responseVo.setOrderPayType("微信支付");
-                }
-                else {
+                } else {
                     responseVo.setOrderPayType("微信支付");
                 }
             }

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

@@ -781,8 +781,8 @@ public class OrderServiceImpl implements Orderservice {
                     orderBean.setShopImageUrl(storeResponseDto.getLogoUrl());
                     //默认骑手头像显示为门店首页图片
                     orderBean.setRiderPhoto(storeResponseDto.getLogoUrl());
-                    orderBean.setLatitude(Double.valueOf(storeResponseDto.getLatitude()));
-                    orderBean.setLongitude(Double.valueOf(storeResponseDto.getLongitude()));
+                    orderBean.setLatitude((StringUtils.isNotBlank(storeResponseDto.getLatitude()) ? Double.valueOf(storeResponseDto.getLatitude()) : 0L));
+                    orderBean.setLongitude(StringUtils.isNotBlank(storeResponseDto.getLongitude()) ? Double.valueOf(storeResponseDto.getLongitude()) : 0L);
                 }
                 // 获取订单运单号，如果有运单则是第三方外卖单
                 if (orderBean.getAddInfo() != null && StringUtils.isNotEmpty(orderBean.getAddInfo().getDeliveryId())) {