|
@@ -813,7 +813,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
storeInfo.setBusinessSectionName(businessSectionName.getDictDetail());
|
|
storeInfo.setBusinessSectionName(businessSectionName.getDictDetail());
|
|
|
storeInfo.setBusinessTypes(String.join(",", businessTypes));
|
|
storeInfo.setBusinessTypes(String.join(",", businessTypes));
|
|
|
storeInfo.setBusinessTypesName(String.join(",", businessTypeNames));
|
|
storeInfo.setBusinessTypesName(String.join(",", businessTypeNames));
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
//处理分类信息
|
|
//处理分类信息
|
|
|
List<String> businessClassify = storeInfoDto.getBusinessClassify();
|
|
List<String> businessClassify = storeInfoDto.getBusinessClassify();
|
|
|
if (!CollectionUtils.isEmpty(businessClassify)) {
|
|
if (!CollectionUtils.isEmpty(businessClassify)) {
|
|
@@ -844,7 +844,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
storeInfo.setBusinessClassify(String.join(",", businessClassify));
|
|
storeInfo.setBusinessClassify(String.join(",", businessClassify));
|
|
|
storeInfo.setBusinessClassifyName(String.join(",", businessClassifyNames));
|
|
storeInfo.setBusinessClassifyName(String.join(",", businessClassifyNames));
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
//存入审批状态为待审批
|
|
//存入审批状态为待审批
|
|
|
storeInfo.setStoreApplicationStatus(0);
|
|
storeInfo.setStoreApplicationStatus(0);
|
|
|
//处理一下行政区域信息
|
|
//处理一下行政区域信息
|
|
@@ -1056,7 +1056,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
storeInfo.setBusinessSectionName(businessSectionName.getDictDetail());
|
|
storeInfo.setBusinessSectionName(businessSectionName.getDictDetail());
|
|
|
storeInfo.setBusinessTypes(String.join(",", businessTypes));
|
|
storeInfo.setBusinessTypes(String.join(",", businessTypes));
|
|
|
storeInfo.setBusinessTypesName(String.join(",", businessTypeNames));
|
|
storeInfo.setBusinessTypesName(String.join(",", businessTypeNames));
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
//处理分类信息
|
|
//处理分类信息
|
|
|
List<String> businessClassify = storeInfoDto.getBusinessClassify();
|
|
List<String> businessClassify = storeInfoDto.getBusinessClassify();
|
|
|
if (!CollectionUtils.isEmpty(businessClassify)) {
|
|
if (!CollectionUtils.isEmpty(businessClassify)) {
|
|
@@ -1087,7 +1087,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
storeInfo.setBusinessClassify(String.join(",", businessClassify));
|
|
storeInfo.setBusinessClassify(String.join(",", businessClassify));
|
|
|
storeInfo.setBusinessClassifyName(String.join(",", businessClassifyNames));
|
|
storeInfo.setBusinessClassifyName(String.join(",", businessClassifyNames));
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
//处理一下行政区域信息
|
|
//处理一下行政区域信息
|
|
|
EssentialCityCode essentialCityCode1 = essentialCityCodeMapper.selectOne(new LambdaQueryWrapper<EssentialCityCode>().eq(EssentialCityCode::getAreaCode, storeInfo.getAdministrativeRegionProvinceAdcode()));
|
|
EssentialCityCode essentialCityCode1 = essentialCityCodeMapper.selectOne(new LambdaQueryWrapper<EssentialCityCode>().eq(EssentialCityCode::getAreaCode, storeInfo.getAdministrativeRegionProvinceAdcode()));
|
|
|
storeInfo.setAdministrativeRegionProvinceName(essentialCityCode1.getAreaName());
|
|
storeInfo.setAdministrativeRegionProvinceName(essentialCityCode1.getAreaName());
|
|
@@ -2333,7 +2333,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
storeInfo.setBusinessTypes(String.join(",", businessTypes));
|
|
storeInfo.setBusinessTypes(String.join(",", businessTypes));
|
|
|
storeInfo.setBusinessTypesName(String.join(",", businessTypeNames));
|
|
storeInfo.setBusinessTypesName(String.join(",", businessTypeNames));
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// 处理分类信息
|
|
// 处理分类信息
|
|
|
List<String> businessClassify = storeInfodto.getBusinessClassify();
|
|
List<String> businessClassify = storeInfodto.getBusinessClassify();
|
|
|
if (!CollectionUtils.isEmpty(businessClassify)) {
|
|
if (!CollectionUtils.isEmpty(businessClassify)) {
|
|
@@ -4792,7 +4792,43 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
storeInfoMapper.updateById(storeInfo);
|
|
storeInfoMapper.updateById(storeInfo);
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
|
-}
|
|
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public List<StoreDictionaryVo> getBusinessClassifyData(Integer parentId) {
|
|
|
|
|
+ // 构建查询条件
|
|
|
|
|
+ LambdaQueryWrapper<StoreDictionary> queryWrapper = new LambdaQueryWrapper<StoreDictionary>()
|
|
|
|
|
+ .eq(StoreDictionary::getTypeName, "business_classify")
|
|
|
|
|
+ .eq(StoreDictionary::getDeleteFlag, 0)
|
|
|
|
|
+ .orderByAsc(StoreDictionary::getDictId);
|
|
|
|
|
+
|
|
|
|
|
+ // 如果指定了parentId,则只查询该父分类下的子分类
|
|
|
|
|
+ if (parentId != null) {
|
|
|
|
|
+ queryWrapper.eq(StoreDictionary::getParentId, parentId);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ // 如果没有指定parentId,则查询所有子分类(parentId不为0或null的分类)
|
|
|
|
|
+ queryWrapper.isNotNull(StoreDictionary::getParentId)
|
|
|
|
|
+ .ne(StoreDictionary::getParentId, 0);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // 查询字典数据
|
|
|
|
|
+ List<StoreDictionary> allClassifies = storeDictionaryMapper.selectList(queryWrapper);
|
|
|
|
|
+
|
|
|
|
|
+ // 构建扁平化的结果列表(仅返回子分类,用于多选功能)
|
|
|
|
|
+ List<StoreDictionaryVo> result = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
+ for (StoreDictionary classify : allClassifies) {
|
|
|
|
|
+ StoreDictionaryVo vo = new StoreDictionaryVo();
|
|
|
|
|
+ BeanUtils.copyProperties(classify, vo);
|
|
|
|
|
+ // 不设置subDataList,返回扁平化列表
|
|
|
|
|
+ result.add(vo);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ return result;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
|