|
@@ -1,9 +1,6 @@
|
|
|
package com.ruoyi.system.service.impl;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
@@ -57,9 +54,10 @@ public class OrderFoodServiceImpl implements IOrderFoodService {
|
|
|
foodTime = orderFoods.stream().collect(Collectors.groupingBy(OrderFood::getOrderFoodTime));
|
|
|
}
|
|
|
List<String> dayList = DateUtils.getDay(orderFood.getOrderFoodTime());
|
|
|
- Map<String,Object> map = new HashMap<>(31);
|
|
|
+ List<Map> mapList = new ArrayList<>();
|
|
|
if (dayList.size()> 0){
|
|
|
for (String day : dayList) {
|
|
|
+ Map<String,Object> map = new HashMap<>(5);
|
|
|
map.put("date",day);
|
|
|
map.put("am","未预约");
|
|
|
map.put("pm","未预约");
|
|
@@ -79,9 +77,10 @@ public class OrderFoodServiceImpl implements IOrderFoodService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ mapList.add(map);
|
|
|
}
|
|
|
}
|
|
|
- return AjaxResult.success(map);
|
|
|
+ return AjaxResult.success(mapList);
|
|
|
}
|
|
|
|
|
|
/**
|