From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 server/service/src/main/java/com/doumee/service/business/ShopService.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/ShopService.java b/server/service/src/main/java/com/doumee/service/business/ShopService.java
index a0b92b3..8160c27 100644
--- a/server/service/src/main/java/com/doumee/service/business/ShopService.java
+++ b/server/service/src/main/java/com/doumee/service/business/ShopService.java
@@ -5,6 +5,8 @@
 import com.doumee.dao.admin.request.UpdateShopSortDTO;
 import com.doumee.dao.business.model.Shop;
 import com.doumee.dao.business.vo.ShopTreeVo;
+import com.doumee.dao.web.reqeust.EditShopDTO;
+import com.doumee.dao.web.reqeust.ShopQueryByLLDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -91,6 +93,8 @@
      */
     PageData<Shop> findPage(PageWrap<Shop> pageWrap);
 
+    List<Shop> getUserShopList(Long userId);
+
     /**
      * 鏉′欢缁熻
      *
@@ -102,6 +106,7 @@
     List<ShopTreeVo> shopTreeCache(Integer type);
     List<ShopTreeVo> shopTree(Integer type);
     String importFcodeBatch(MultipartFile file);
+    String importCategoryBatch(MultipartFile file);
     void updateSort(UpdateShopSortDTO dto);
 
     String importBatch(MultipartFile file);
@@ -109,4 +114,26 @@
     void dealShopNamePath();
 
     List<Shop> listByParent(String parentId);
+
+    /**
+     * 鏍规嵁缁忕含搴� 鑾峰彇闂ㄥ簵鍒楄〃
+     * @param pageWrap
+     * @return
+     */
+    PageData<Shop> queryShopByLL(PageWrap<Shop> pageWrap);
+
+    /**
+     * 闂ㄥ簵璇︽儏
+     * @param id
+     * @return
+     */
+    Shop shopDetail(Long id,Long memberId);
+
+    /**
+     * 淇敼闂ㄥ簵淇℃伅
+     * @param editShopDTO
+     */
+    void updShop(EditShopDTO editShopDTO);
+
+
 }

--
Gitblit v1.9.3