bug--修复商品分类重复遍历
This commit is contained in:
@ -54,8 +54,6 @@ import java.util.*;
|
|||||||
@RequestMapping("api")
|
@RequestMapping("api")
|
||||||
public class StoreProductController {
|
public class StoreProductController {
|
||||||
|
|
||||||
private static List<Map<String,Object>> cateList = new ArrayList<>();
|
|
||||||
|
|
||||||
private final YxStoreProductService yxStoreProductService;
|
private final YxStoreProductService yxStoreProductService;
|
||||||
private final YxStoreCategoryService yxStoreCategoryService;
|
private final YxStoreCategoryService yxStoreCategoryService;
|
||||||
private final YxShippingTemplatesService yxShippingTemplatesService;
|
private final YxShippingTemplatesService yxShippingTemplatesService;
|
||||||
@ -138,7 +136,9 @@ public class StoreProductController {
|
|||||||
List<YxStoreCategory> storeCategories = yxStoreCategoryService.lambdaQuery()
|
List<YxStoreCategory> storeCategories = yxStoreCategoryService.lambdaQuery()
|
||||||
.eq(YxStoreCategory::getIsShow, ShopCommonEnum.SHOW_1.getValue())
|
.eq(YxStoreCategory::getIsShow, ShopCommonEnum.SHOW_1.getValue())
|
||||||
.list();
|
.list();
|
||||||
map.put("cateList", this.makeCate(storeCategories,0,1));
|
|
||||||
|
List<Map<String,Object>> cateList = new ArrayList<>();
|
||||||
|
map.put("cateList", this.makeCate(storeCategories,cateList,0,1));
|
||||||
|
|
||||||
//商品规格
|
//商品规格
|
||||||
map.put("ruleList",yxStoreProductRuleService.list());
|
map.put("ruleList",yxStoreProductRuleService.list());
|
||||||
@ -193,16 +193,11 @@ public class StoreProductController {
|
|||||||
* @param level d等级
|
* @param level d等级
|
||||||
* @return list
|
* @return list
|
||||||
*/
|
*/
|
||||||
private List<Map<String,Object>> makeCate(List<YxStoreCategory> data, int pid, int level)
|
private List<Map<String,Object>> makeCate(List<YxStoreCategory> data,List<Map<String,Object>> cateList,int pid, int level)
|
||||||
{
|
{
|
||||||
String html = "|-----";
|
String html = "|-----";
|
||||||
String newHtml = "";
|
String newHtml = "";
|
||||||
|
|
||||||
|
|
||||||
if(cateList.size() == data.size()){
|
|
||||||
return cateList;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 0; i < data.size(); i++) {
|
for (int i = 0; i < data.size(); i++) {
|
||||||
YxStoreCategory storeCategory = data.get(i);
|
YxStoreCategory storeCategory = data.get(i);
|
||||||
int catePid = storeCategory.getPid();
|
int catePid = storeCategory.getPid();
|
||||||
@ -220,7 +215,7 @@ public class StoreProductController {
|
|||||||
data.remove(i);
|
data.remove(i);
|
||||||
|
|
||||||
i--;
|
i--;
|
||||||
this.makeCate(data,storeCategory.getId(),level + 1);
|
this.makeCate(data,cateList,storeCategory.getId(),level + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user