Merge branch 'feature/20210603-v2.0.33-订单获取预计送达时间ID1030763-周晓航' into qa

e0deb94d · 周晓航 · de1acced · b0801b22 · e0deb94d
Commit e0deb94d authored Jun 23, 2021 by 周晓航
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+1 -1

No files found.
--- a/order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+++ b/order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
@@ -896,7 +896,7 @@ public class CheckOrder {

            // 【ID1030916】订单查询门店获取预计送达时间 并且不是预约单
            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());