Skip to content

O
order-group
Commit 257bdda7 by 徐康
Options

Merge remote-tracking branch 'origin/qa' into qa

parents 29f4af42 e0deb94d
Showing with 1 additions and 1 deletions
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
...@@ -896,7 +896,7 @@ public class CheckOrder { ...@@ -896,7 +896,7 @@ public class CheckOrder {
// 【ID1030916】订单查询门店获取预计送达时间 并且不是预约单 // 【ID1030916】订单查询门店获取预计送达时间 并且不是预约单
if (StringUtils.isEmpty(createOrderVo.getExpectTime())) { if (StringUtils.isEmpty(createOrderVo.getExpectTime())) {
userDeliveryInfoDto.setEstimateDeliveryCompleteTime(getEstimateDeliveryCompleteTime(createOrderVo.getLatitude(), createOrderVo.getLongitude(), storeDeliveryInfoDto.getPartnerId(), storeDeliveryInfoDto.getStoreId())); userDeliveryInfoDto.setEstimateDeliveryCompleteTime(getEstimateDeliveryCompleteTime(receiveAddressResult.getLatitude(), receiveAddressResult.getLongitude(), storeDeliveryInfoDto.getPartnerId(), storeDeliveryInfoDto.getStoreId()));
} }
} }
userDeliveryInfoDto.setReceiveUserName(receiveAddressResult.getReceiveName()); userDeliveryInfoDto.setReceiveUserName(receiveAddressResult.getReceiveName());
......
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