Skip to content

O
order-group
Commit d3260494 by 徐光兴
Options

三目运算符导致的空指针修复

parent fc2a1d10
Showing with 2 additions and 2 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -865,7 +865,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -865,7 +865,7 @@ public class OrderServiceImpl implements Orderservice {
orderBean.setRiderPhoto(storeResponseDto.getLogoUrl()); orderBean.setRiderPhoto(storeResponseDto.getLogoUrl());
orderBean.setLatitude((StringUtils.isNotBlank(storeResponseDto.getLatitude()) ? Double.valueOf(storeResponseDto.getLatitude()) : 0d)); orderBean.setLatitude((StringUtils.isNotBlank(storeResponseDto.getLatitude()) ? Double.valueOf(storeResponseDto.getLatitude()) : 0d));
orderBean.setLongitude((StringUtils.isNotBlank(storeResponseDto.getLongitude()) ? Double.valueOf(storeResponseDto.getLongitude()) : 0d)); orderBean.setLongitude((StringUtils.isNotBlank(storeResponseDto.getLongitude()) ? Double.valueOf(storeResponseDto.getLongitude()) : 0d));
orderBean.setProgressBarStatus(storeResponseDto.getProcessBarResponse() == null ? 2 : storeResponseDto.getProcessBarResponse().getStatus()); orderBean.setProgressBarStatus(storeResponseDto.getProcessBarResponse() == null ? Integer.valueOf(2) : storeResponseDto.getProcessBarResponse().getStatus());
} }
// 获取订单运单号，如果有运单则是第三方外卖单 // 获取订单运单号，如果有运单则是第三方外卖单
if (orderBean.getAddInfo() != null && StringUtils.isNotEmpty(orderBean.getAddInfo().getDeliveryId())) { if (orderBean.getAddInfo() != null && StringUtils.isNotEmpty(orderBean.getAddInfo().getDeliveryId())) {
...@@ -1587,7 +1587,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1587,7 +1587,7 @@ public class OrderServiceImpl implements Orderservice {
orderBean.setShopPhone(storeResponseDto.getPhone()); orderBean.setShopPhone(storeResponseDto.getPhone());
orderBean.setLatitude(Double.valueOf(storeResponseDto.getLatitude())); orderBean.setLatitude(Double.valueOf(storeResponseDto.getLatitude()));
orderBean.setLongitude(Double.valueOf(storeResponseDto.getLongitude())); orderBean.setLongitude(Double.valueOf(storeResponseDto.getLongitude()));
orderBean.setProgressBarStatus(storeResponseDto.getProcessBarResponse() == null ? 2 : storeResponseDto.getProcessBarResponse().getStatus()); orderBean.setProgressBarStatus(storeResponseDto.getProcessBarResponse() == null ? Integer.valueOf(2) : storeResponseDto.getProcessBarResponse().getStatus());
organizationId = storeResponseDto.getParentId(); organizationId = storeResponseDto.getParentId();
} }
//TODO 查询订单的排队人数 //TODO 查询订单的排队人数
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment