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

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());