From f652ac3e21759e5fb5eac57d1a753ce9ab7b7919 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 20 四月 2021 18:59:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
index 416dbce..b216bf5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
@@ -193,9 +193,18 @@
* @return 商品列表
*/
@Override
- public R pageShopGoods(ComShopGoodsDTO comShopGoodsDTO) {
- Page page = new Page<>(comShopGoodsDTO.getPageNum(), comShopGoodsDTO.getPageSize());
- return R.ok(this.baseMapper.pageShopGoodByApps(page, comShopGoodsDTO));
+ public R pageShopGoods(ComShopGoodsDTO comShopGoodsDTO){
+ Page page = new Page<>(comShopGoodsDTO.getPageNum(),comShopGoodsDTO.getPageSize());
+ IPage<ComShopGoodsVO> goodsVOIPage = this.baseMapper.pageShopGoodByApps(page,comShopGoodsDTO);
+ if(!goodsVOIPage.getRecords().isEmpty()){
+ goodsVOIPage.getRecords().forEach(goodsVo -> {
+ List<ComShopGoodsAttrVO> goodsAttrList = shopGoodsAttrDAO.getGoodsAttr(goodsVo.getId());
+ if(!goodsAttrList.isEmpty()){
+ goodsVo.setGoodsAttrList(goodsAttrList);
+ }
+ });
+ }
+ return R.ok(goodsVOIPage);
}
/**
--
Gitblit v1.7.1