From d3abd08d49bd74000d57bd3ba97537f4fc14fa2b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 20:29:51 +0800
Subject: [PATCH] DEMO初步完成

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
index 677b884..5ec8cf6 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
@@ -2,13 +2,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.shop.domain.dto.*;
-import com.ruoyi.shop.domain.pojo.shop.Shop;
+import com.ruoyi.shop.domain.vo.*;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.shop.domain.vo.AppNearbyShopVo;
-import com.ruoyi.shop.domain.vo.AppShopInfoVo;
-import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
-import com.ruoyi.shop.domain.vo.MgtShopPageVo;
 import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
 
 import java.util.List;
 
@@ -70,9 +68,28 @@
     AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto, Member member);
 
     /**
-     * 获取商户详情
+     *
+     * @param shopId
+     * @return
+     */
+    Shop getByShopId(Long shopId);
+
+
+
+    /**
+     * 获取商户端首页统计
      * @param userId
      * @return
      */
-    //MgtShopInfoVo getMerShopInfo(Long userId);
+    MerHomeShopTotalVo getMerHomeTotal(Long userId);
+
+    /**
+     *
+     * @param page
+     * @param merAgencyPageDto
+     * @return
+     */
+    List<MerAgencyPageVo> pageMerAgencyVo (Page page, MerAgencyPageDto merAgencyPageDto);
+
+
 }

--
Gitblit v1.7.1