|
@@ -244,7 +244,15 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
IndexDataType.VIP_GROUP_OFFLINE_COURSE.equals(typeDateMapEntry.getKey())){
|
|
IndexDataType.VIP_GROUP_OFFLINE_COURSE.equals(typeDateMapEntry.getKey())){
|
|
for (IndexBaseMonthData indexBaseMonthData : indexBaseData.getIndexMonthData()) {
|
|
for (IndexBaseMonthData indexBaseMonthData : indexBaseData.getIndexMonthData()) {
|
|
if(vipCategoryCourseListMap.containsKey(indexBaseMonthData.getMonth())&&vipCategoryCourseListMap.get(indexBaseMonthData.getMonth()).containsKey(indexBaseData.getDataType())){
|
|
if(vipCategoryCourseListMap.containsKey(indexBaseMonthData.getMonth())&&vipCategoryCourseListMap.get(indexBaseMonthData.getMonth()).containsKey(indexBaseData.getDataType())){
|
|
- indexBaseMonthData.setExtendInfo(JSON.toJSONString(vipCategoryCourseListMap.get(indexBaseMonthData.getMonth()).get(indexBaseData.getDataType())));
|
|
|
|
|
|
+ Map<String, Integer> extendMap = vipCategoryCourseListMap.get(indexBaseMonthData.getMonth()).get(indexBaseData.getDataType());
|
|
|
|
+ TreeMap<String, Integer> extendSortMap = new TreeMap<>(new Comparator<String>() {
|
|
|
|
+ @Override
|
|
|
|
+ public int compare(String o1, String o2) {
|
|
|
|
+ return o1.compareTo(o2);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ extendSortMap.putAll(extendMap);
|
|
|
|
+ indexBaseMonthData.setExtendInfo(JSON.toJSONString(extendSortMap));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|