From f721ee13dc5f95f607bb25b09f73cae6a7123ed9 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期六, 17 四月 2021 17:56:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
index 1eec7c5..b5335c5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
@@ -7,6 +7,10 @@
 import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.shop.PageShopStoreVO;
+import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
+import com.panzhihua.service_community.dao.ComShopGoodsDAO;
+import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
+import com.panzhihua.common.model.vos.shop.ShopGoodsVO;
 import com.panzhihua.common.model.vos.shop.ShopStoreVO;
 import com.panzhihua.service_community.dao.ComShopStoreDAO;
 import com.panzhihua.service_community.model.dos.ComShopStoreDO;
@@ -14,6 +18,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
 
 /**
  * @auther lyq
@@ -23,6 +29,16 @@
 @Slf4j
 @Service
 public class ComShopStoreServiceImpl extends ServiceImpl<ComShopStoreDAO, ComShopStoreDO> implements ComShopStoreService {
+
+    @Resource
+    private ComShopGoodsDAO shopGoodsDAO;
+
+    /**
+     * 查询店铺列表
+     * @param comShopStoreDTO   请求参数
+     * @return  店铺列表
+     */
+
     @Override
     public R pageStoreList(PageComShopStoreDTO pageComShopStoreDTO) {
         Page page = new Page<>(pageComShopStoreDTO.getPageNum(), pageComShopStoreDTO.getPageSize());
@@ -30,6 +46,32 @@
         return R.ok(comShopStoreVOIPage);
     }
 
+    /**
+     * 查询店铺详情
+     * @param comShopStoreDTO   请求参数
+     * @return  店铺详情
+     */
+    @Override
+    public R shopStoreDetail(PageComShopStoreDTO comShopStoreDTO) {
+        //查询店铺
+        ComShopStoreDO storeDO = this.baseMapper.selectById(comShopStoreDTO.getStoreId());
+        if (storeDO == null) {
+            return R.fail(401,"店铺不存在");
+        }
+        if(storeDO.getStatus().equals(ComShopStoreDO.status.no)){
+            return R.fail(402,"店铺已被禁用");
+        }
+        ComShopStoreVO shopStoreVO = new ComShopStoreVO();
+        BeanUtils.copyProperties(storeDO, shopStoreVO);
+
+        //查询店铺下商品信息
+        Page page = new Page<>(comShopStoreDTO.getPageNum(), comShopStoreDTO.getPageSize());
+        shopStoreVO.setGoodsList(shopGoodsDAO.pageShopGoodsByStoreId(page, comShopStoreDTO).getRecords());
+
+        return R.ok(shopStoreVO);
+
+    }
+
     @Override
     public R saveStore(ShopStoreVO storeVO) {
         if (storeVO == null) {

--
Gitblit v1.7.1