From 6cca89c41aea52ae6b23909bb9fbd2834f0094d5 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 08 六月 2023 18:43:12 +0800
Subject: [PATCH] 基础配置

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java |   43 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 35 insertions(+), 8 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 f91f10d..42750ec 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.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;
 
@@ -31,9 +29,9 @@
 
     /**
      * 创建商户
-     * @param MGTEditShopDto
+     * @param mgtEditShopDto
      */
-    void createShop(MgtEditShopDto MGTEditShopDto);
+    void createShop(MgtEditShopDto mgtEditShopDto);
 
     /**
      * 修改合作时间
@@ -76,10 +74,39 @@
      */
     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);
+
+    /**
+     * @description  平台获取商户分成列表
+     * @author  jqs
+     * @date    2023/6/8 9:25
+     * @param page
+     * @param mgtShopProportionPageDto
+     * @return  List<MgtShopProportionPageVo>
+     */
+    List<MgtShopProportionPageVo> pageMgtShopProportion(Page page, MgtShopProportionPageDto mgtShopProportionPageDto);
+
+    /**
+     * @description  删除商户标签
+     * @author  jqs
+     * @date    2023/6/8 15:53
+     * @param shopTag
+     * @return  void
+     */
+    void deleteShopTag(String shopTag);
 }

--
Gitblit v1.7.1