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

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

@@ -1209,20 +1209,24 @@ public class OrderAdapter {
                 } else {
                     responseVo.setTakeMealTime("我已到店");
                 }
-                // 更新该字段 用于 预计送达时间
-                if (orderExtInfoDto != null && StringUtils.isNotBlank(orderExtInfoDto.getDeliveryHoursDayStart())
-
-                        && StringUtils.isNotBlank(orderExtInfoDto.getPayDate())) {
-                    Date createTime = new Date(ordersBean.getGmtCreate());
-                    Date deliveryHoursDayStart = DateUtil.convert2Date(orderExtInfoDto.getDeliveryHoursDayStart(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
-                    Integer serviceTime = orderExtInfoDto.getServiceTime();
-                    if (serviceTime == null) {
-                        serviceTime = 50;
-                    }
-                    if (createTime.before(deliveryHoursDayStart)) {
-                        responseVo.setReserveDeliveryTime(DateUtil.convert2String(DateUtil.addMinutes(deliveryHoursDayStart, serviceTime), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
-                    } else {
-                        responseVo.setReserveDeliveryTime(DateUtil.convert2String(DateUtil.addMinutes(createTime, serviceTime), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+                if (ordersBean.getEstimateDeliveryCompleteTime() !=null) {
+                    //responseVo.setReserveDeliveryTime();
+                } else {
+                    // 更新该字段 用于 预计送达时间
+                    if (orderExtInfoDto != null && StringUtils.isNotBlank(orderExtInfoDto.getDeliveryHoursDayStart())
+
+                            && StringUtils.isNotBlank(orderExtInfoDto.getPayDate())) {
+                        Date createTime = new Date(ordersBean.getGmtCreate());
+                        Date deliveryHoursDayStart = DateUtil.convert2Date(orderExtInfoDto.getDeliveryHoursDayStart(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
+                        Integer serviceTime = orderExtInfoDto.getServiceTime();
+                        if (serviceTime == null) {
+                            serviceTime = 50;
+                        }
+                        if (createTime.before(deliveryHoursDayStart)) {
+                            responseVo.setReserveDeliveryTime(DateUtil.convert2String(DateUtil.addMinutes(deliveryHoursDayStart, serviceTime), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+                        } else {
+                            responseVo.setReserveDeliveryTime(DateUtil.convert2String(DateUtil.addMinutes(createTime, serviceTime), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+                        }
                     }
                 }
             }

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

@@ -51,6 +51,7 @@ import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformIapp
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerStoreDeliveryConfigManager;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.application.sdk.api.base.BaseResponse;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
 import com.freemud.application.sdk.api.membercenter.request.StatisticalPropertyRequest;
@@ -894,7 +895,7 @@ public class CheckOrder {
             userDeliveryInfoDto.getStoreDeliveryInfoDto().setDeliveryType(s);
 
             // 【ID1030916】订单查询门店获取预计送达时间 并且不是预约单
-            if (StringUtils.isNotEmpty(createOrderVo.getExpectTime())) {
+            if (StringUtils.isEmpty(createOrderVo.getExpectTime())) {
                 userDeliveryInfoDto.setEstimateDeliveryCompleteTime(getEstimateDeliveryCompleteTime(createOrderVo.getLatitude(), createOrderVo.getLongitude(), storeDeliveryInfoDto.getPartnerId(), storeDeliveryInfoDto.getStoreId()));
             }
         }
@@ -938,6 +939,7 @@ public class CheckOrder {
         request.setPartnerId(partnerId);
         request.setStoreCode(storeCode);
         StoreCBaseResponse<StoreCBaseResponseDto> responseDto = storeBaseApiClient.queryDeliverDetail(request);
+        ApiLog.info("fisherman 获取门店预计送达时间",request,responseDto);
         if (responseDto == null) {
             throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR);
         }

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

@@ -1073,7 +1073,7 @@ public class OrderServiceImpl implements Orderservice {
 
             });
         }
-
+        LogUtil.info(" fisherman queryOrders _>",orders,null);
         List<QueryOrderResponseVo> queryOrderResponseVos = orderAdapter.convent2QueryOrderResponseVos(orders, userLoginInfoDto.getWxAppId(), userLoginInfoDto.getIappId());
 
         if (QueryOrderStatus.TAKE_MEAL.getCode().intValue() == queryOrderVo.getQueryOrderStatus()) {