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

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

@@ -1210,7 +1210,7 @@ public class OrderAdapter {
                     responseVo.setTakeMealTime("我已到店");
                 }
                 if (ordersBean.getEstimateDeliveryCompleteTime() !=null) {
-                    //responseVo.setReserveDeliveryTime();
+                    responseVo.setReserveDeliveryTime(DateUtil.convert2String(new Date(ordersBean.getEstimateDeliveryCompleteTime()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
                 } else {
                     // 更新该字段 用于 预计送达时间
                     if (orderExtInfoDto != null && StringUtils.isNotBlank(orderExtInfoDto.getDeliveryHoursDayStart())

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

@@ -1073,7 +1073,6 @@ 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()) {