|
@@ -2484,7 +2484,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
} else {
|
|
} else {
|
|
|
// 如果没有指定businessType,则查询所有四种类型的店铺
|
|
// 如果没有指定businessType,则查询所有四种类型的店铺
|
|
|
// 需要查询字典表获取所有四种类型的dictId
|
|
// 需要查询字典表获取所有四种类型的dictId
|
|
|
- List<String> storeTypeNames = Arrays.asList("酒吧", "KTV", "洗浴汗蒸", "按摩足浴");
|
|
|
|
|
|
|
+ List<String> storeTypeNames = Arrays.asList("酒吧", "KTV", "洗浴汗蒸", "按摩足疗");
|
|
|
List<StoreDictionary> storeDictionaries = storeDictionaryMapper.selectList(
|
|
List<StoreDictionary> storeDictionaries = storeDictionaryMapper.selectList(
|
|
|
new LambdaQueryWrapper<StoreDictionary>()
|
|
new LambdaQueryWrapper<StoreDictionary>()
|
|
|
.eq(StoreDictionary::getTypeName, "business_section")
|
|
.eq(StoreDictionary::getTypeName, "business_section")
|
|
@@ -2492,29 +2492,6 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
.eq(StoreDictionary::getDeleteFlag, 0)
|
|
.eq(StoreDictionary::getDeleteFlag, 0)
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
- // 构建business_section的ID列表
|
|
|
|
|
-// List<Integer> businessSectionIds = new ArrayList<>();
|
|
|
|
|
-// businessSectionIds.add(3); // KTV
|
|
|
|
|
-// businessSectionIds.add(4); // 洗浴汗蒸
|
|
|
|
|
-// businessSectionIds.add(5); // 按摩足浴
|
|
|
|
|
-// businessSectionIds.add(11);// 酒吧
|
|
|
|
|
-//
|
|
|
|
|
-// // 添加从字典表查询到的其他类型(如酒吧)
|
|
|
|
|
-// if (!CollectionUtils.isEmpty(storeDictionaries)) {
|
|
|
|
|
-// for (StoreDictionary dict : storeDictionaries) {
|
|
|
|
|
-// if (StringUtils.isNotEmpty(dict.getDictId())) {
|
|
|
|
|
-// try {
|
|
|
|
|
-// Integer dictId = Integer.parseInt(dict.getDictId());
|
|
|
|
|
-// if (!businessSectionIds.contains(dictId)) {
|
|
|
|
|
-// businessSectionIds.add(dictId);
|
|
|
|
|
-// }
|
|
|
|
|
-// } catch (NumberFormatException e) {
|
|
|
|
|
-// // 忽略非数字的dictId
|
|
|
|
|
-// }
|
|
|
|
|
-// }
|
|
|
|
|
-// }
|
|
|
|
|
-// }
|
|
|
|
|
-
|
|
|
|
|
List<Integer> businessSectionIds = storeDictionaries.stream()
|
|
List<Integer> businessSectionIds = storeDictionaries.stream()
|
|
|
.filter(dict -> StringUtils.isNotEmpty(dict.getDictId()))
|
|
.filter(dict -> StringUtils.isNotEmpty(dict.getDictId()))
|
|
|
.map(StoreDictionary::getDictId)
|
|
.map(StoreDictionary::getDictId)
|