clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

产品列表查询补充字段；类目查询level为1的一级不带"全部"

This commit is contained in:
donqi 2022-08-31 18:19:58 +08:00
parent de181ff5d7
commit f9d49aea4a
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
View File

@ -98,13 +98,22 @@ public class GoodsController extends BaseController {
} }
List<Goods> list = goodsService.selectGoodsList(goods); List<Goods> list = goodsService.selectGoodsList(goods);
list.forEach(one -> { list.forEach(one -> {
// 补全商品 // 补全商品服务区域
List<GoodsArea> goodsAreas = goodsAreaService.selectByGoodsId(one.getGoodsId()); List<GoodsArea> goodsAreas = goodsAreaService.selectByGoodsId(one.getGoodsId());
one.setGoodsAreaList(goodsAreas); one.setGoodsAreaList(goodsAreas);
// 补全商品类别 // 补全商品规格
List<GoodsStandard> goodsStandards = goodsStandardService.selectByGoodsId(one.getGoodsId()); List<GoodsStandard> goodsStandards = goodsStandardService.selectByGoodsId(one.getGoodsId());
one.setGoodsStandardList(goodsStandards); one.setGoodsStandardList(goodsStandards);
// 补全商品类目及父级类目信息
GoodsCategory goodsCategory = goodsCategoryService.selectById(one.getDeptGoodsCategoryId());
one.setDeptGoodsCategoryName(goodsCategory.getGoodsCategoryName());
if (goodsCategory.getParentCategoryId() != null) {
GoodsCategory parGoodsCategory = goodsCategoryService.selectById(goodsCategory.getParentCategoryId());
one.setParGoodsCategoryId(parGoodsCategory.getGoodsCategoryId());
one.setParGoodsCategoryName(parGoodsCategory.getGoodsCategoryName());
}
}); });
return getDataTable(list); return getDataTable(list);
} }

4
ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java
View File

@ -87,13 +87,13 @@ public class GoodsDeptCategoryController extends BaseController {
try { try {
if (deptGoodsCategory.getIsAllNode() == null || !deptGoodsCategory.getIsAllNode()) { if (deptGoodsCategory.getIsAllNode() == null || !deptGoodsCategory.getIsAllNode()) {
List<DeptGoodsCategory> list = deptGoodsCategoryService.listByStep(deptGoodsCategory); List<DeptGoodsCategory> list = deptGoodsCategoryService.listByStep(deptGoodsCategory);
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list) && list.get(0).getLevel() > 1) {
DeptGoodsCategory allGoodsNode = new DeptGoodsCategory(); DeptGoodsCategory allGoodsNode = new DeptGoodsCategory();
allGoodsNode.setGoodsCategoryName("全部"); allGoodsNode.setGoodsCategoryName("全部");
allGoodsNode.setIsAllNode(true); allGoodsNode.setIsAllNode(true);
resList.add(allGoodsNode); resList.add(allGoodsNode);
resList.addAll(list);
} }
resList.addAll(list);
} }
return AjaxResult.success(resList); return AjaxResult.success(resList);
} catch (Exception e) { } catch (Exception e) {

6
ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
View File

@ -43,8 +43,14 @@ public class Goods extends BaseEntity {
@Excel(name = "类别id,必须是关联到系统的第三级目录") @Excel(name = "类别id,必须是关联到系统的第三级目录")
private Long deptGoodsCategoryId; private Long deptGoodsCategoryId;
private String deptGoodsCategoryName;
private List<Long> deptGoodsCategoryIds; private List<Long> deptGoodsCategoryIds;
private Long parGoodsCategoryId;
private String parGoodsCategoryName;
@Excel(name = "商品图片", cellType = Excel.ColumnType.IMAGE) @Excel(name = "商品图片", cellType = Excel.ColumnType.IMAGE)
private String goodsImgUrl; private String goodsImgUrl;

2
ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
View File

@ -29,7 +29,7 @@
FROM goods FROM goods
</sql> </sql>
<sql id="selectGoodsWithArea"> <sql id="selectGoodsWithArea">
SELECT DISTINCT g.goods_id, goods_code, dept_id, goods_name, goods_desc, goods_sort, worker_id, SELECT DISTINCT g.goods_id, goods_code, dept_id, goods_name, goods_desc, goods_sort, worker_id, goods_unit,
dept_goods_category_id, goods_img_url, goods_video_url, status, create_by, create_time, remark dept_goods_category_id, goods_img_url, goods_video_url, status, create_by, create_time, remark
FROM goods g FROM goods g
LEFT JOIN goods_area ga ON g.goods_id = ga.goods_id LEFT JOIN goods_area ga ON g.goods_id = ga.goods_id