打日志

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -1193,20 +1193,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/OrderServiceImpl.java

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