|
|
@@ -244,6 +244,24 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
LambdaQueryWrapper<StoreImg> eq = new LambdaQueryWrapper<StoreImg>().eq(StoreImg::getImgType, 10).eq(StoreImg::getStoreId, id);
|
|
|
StoreImg storeImg = storeImgMapper.selectOne(eq);
|
|
|
storeMainInfoVo.setHeadImgUrl(storeImg != null ? storeImg.getImgUrl() : "");
|
|
|
+
|
|
|
+ // 查询头图列表(包含is_extract字段)
|
|
|
+ Integer imgMode = storeInfo.getImgMode();
|
|
|
+ Integer headerImgType = null;
|
|
|
+ if (imgMode != null && imgMode == 1) {
|
|
|
+ // 多图模式
|
|
|
+ headerImgType = GroupConstant.IMG_TYPE_MULTI_MODE;
|
|
|
+ } else {
|
|
|
+ // 单图模式(默认)
|
|
|
+ headerImgType = GroupConstant.IMG_TYPE_SINGLE_MODE;
|
|
|
+ }
|
|
|
+ LambdaQueryWrapper<StoreImg> headerImgQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ headerImgQueryWrapper.eq(StoreImg::getImgType, headerImgType);
|
|
|
+ headerImgQueryWrapper.eq(StoreImg::getStoreId, id);
|
|
|
+ headerImgQueryWrapper.orderByAsc(StoreImg::getImgSort);
|
|
|
+ List<StoreImg> headerImgList = storeImgMapper.selectList(headerImgQueryWrapper);
|
|
|
+ storeMainInfoVo.setHeaderImgList(headerImgList);
|
|
|
+
|
|
|
List<StoreUser> storeUsers = storeUserMapper.selectList(new LambdaQueryWrapper<StoreUser>().eq(StoreUser::getStoreId, storeInfo.getId()));
|
|
|
for (StoreUser storeUser : storeUsers) {
|
|
|
storeMainInfoVo.setLogoutFlagUser(storeUser.getLogoutFlag());
|
|
|
@@ -796,8 +814,14 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
List<String> businessTypeNames = new ArrayList<>();
|
|
|
//获取经营种类名称
|
|
|
for (String businessType : businessTypes) {
|
|
|
- StoreDictionary storeDictionary = storeDictionaryMapper.selectOne(new LambdaQueryWrapper<StoreDictionary>().eq(StoreDictionary::getDictId, businessType).eq(StoreDictionary::getParentId, businessSectionName.getId()));
|
|
|
- businessTypeNames.add(storeDictionary.getDictDetail());
|
|
|
+ StoreDictionary storeDictionary = storeDictionaryMapper.selectOne(new LambdaQueryWrapper<StoreDictionary>()
|
|
|
+ .eq(StoreDictionary::getDictId, businessType)
|
|
|
+ .eq(StoreDictionary::getParentId, businessSectionName.getId())
|
|
|
+ .eq(StoreDictionary::getTypeName, "business_type")
|
|
|
+ .eq(StoreDictionary::getDeleteFlag, 0));
|
|
|
+ if (storeDictionary != null) {
|
|
|
+ businessTypeNames.add(storeDictionary.getDictDetail());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
StoreInfoVo result = new StoreInfoVo();
|
|
|
@@ -1251,8 +1275,14 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
List<String> businessTypeNames = new ArrayList<>();
|
|
|
//获取经营种类名称
|
|
|
for (String businessType : businessTypes) {
|
|
|
- StoreDictionary storeDictionary = storeDictionaryMapper.selectOne(new LambdaQueryWrapper<StoreDictionary>().eq(StoreDictionary::getDictId, businessType).eq(StoreDictionary::getParentId, businessSectionName.getId()));
|
|
|
- businessTypeNames.add(storeDictionary.getDictDetail());
|
|
|
+ StoreDictionary storeDictionary = storeDictionaryMapper.selectOne(new LambdaQueryWrapper<StoreDictionary>()
|
|
|
+ .eq(StoreDictionary::getDictId, businessType)
|
|
|
+ .eq(StoreDictionary::getParentId, businessSectionName.getId())
|
|
|
+ .eq(StoreDictionary::getTypeName, "business_type")
|
|
|
+ .eq(StoreDictionary::getDeleteFlag, 0));
|
|
|
+ if (storeDictionary != null) {
|
|
|
+ businessTypeNames.add(storeDictionary.getDictDetail());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
StoreInfoVo result = new StoreInfoVo();
|
|
|
@@ -1429,7 +1459,9 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
.eq(StoreDictionary::getDictId, parentId)
|
|
|
.isNull(StoreDictionary::getParentId));
|
|
|
List<StoreDictionary> storeDictionaries = storeDictionaryMapper.selectList(new LambdaQueryWrapper<StoreDictionary>()
|
|
|
- .eq(StoreDictionary::getParentId, businessSection.getId()));
|
|
|
+ .eq(StoreDictionary::getTypeName, "business_type")
|
|
|
+ .eq(StoreDictionary::getParentId, businessSection.getId())
|
|
|
+ .eq(StoreDictionary::getDeleteFlag, 0));
|
|
|
List<StoreDictionaryVo> voList = new ArrayList<>();
|
|
|
for (StoreDictionary storeDictionary : storeDictionaries) {
|
|
|
StoreDictionaryVo vo = new StoreDictionaryVo();
|
|
|
@@ -2541,6 +2573,8 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
new LambdaQueryWrapper<StoreDictionary>()
|
|
|
.in(StoreDictionary::getDictId, businessTypes) // 批量匹配id
|
|
|
.eq(StoreDictionary::getParentId, businessSectionDict.getId())
|
|
|
+ .eq(StoreDictionary::getTypeName, "business_type") // 只查询经营种类,排除擅长标签
|
|
|
+ .eq(StoreDictionary::getDeleteFlag, 0)
|
|
|
);
|
|
|
// 转为Map<dictId, StoreDictionary>,方便快速获取
|
|
|
Map<String, StoreDictionary> typeDictMap = typeDicts.stream()
|