Commit 0f7b8f6a by 周晓航

预计送达时间 展示i

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent 258d2add
...@@ -1194,7 +1194,7 @@ public class OrderAdapter { ...@@ -1194,7 +1194,7 @@ public class OrderAdapter {
responseVo.setTakeMealTime("我已到店"); responseVo.setTakeMealTime("我已到店");
} }
if (ordersBean.getEstimateDeliveryCompleteTime() !=null) { if (ordersBean.getEstimateDeliveryCompleteTime() !=null) {
//responseVo.setReserveDeliveryTime(); responseVo.setReserveDeliveryTime(DateUtil.convert2String(new Date(ordersBean.getEstimateDeliveryCompleteTime()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
} else { } else {
// 更新该字段 用于 预计送达时间 // 更新该字段 用于 预计送达时间
if (orderExtInfoDto != null && StringUtils.isNotBlank(orderExtInfoDto.getDeliveryHoursDayStart()) if (orderExtInfoDto != null && StringUtils.isNotBlank(orderExtInfoDto.getDeliveryHoursDayStart())
......
...@@ -1052,7 +1052,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1052,7 +1052,6 @@ public class OrderServiceImpl implements Orderservice {
}); });
} }
LogUtil.info(" fisherman queryOrders _>",orders,null);
List<QueryOrderResponseVo> queryOrderResponseVos = orderAdapter.convent2QueryOrderResponseVos(orders, userLoginInfoDto.getWxAppId(), userLoginInfoDto.getIappId()); List<QueryOrderResponseVo> queryOrderResponseVos = orderAdapter.convent2QueryOrderResponseVos(orders, userLoginInfoDto.getWxAppId(), userLoginInfoDto.getIappId());
if (QueryOrderStatus.TAKE_MEAL.getCode().intValue() == queryOrderVo.getQueryOrderStatus()) { if (QueryOrderStatus.TAKE_MEAL.getCode().intValue() == queryOrderVo.getQueryOrderStatus()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment