From d7452d46f66a58caaad0442fbcca6953336c18ea Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 14 六月 2023 16:04:29 +0800
Subject: [PATCH] 活动管理

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java |   74 ++++++++++++++++++++++++++++++++-----
 1 files changed, 64 insertions(+), 10 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..6574b9a 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,13 @@
 
 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.dto.MgtShopIdByCodeDto;
+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 com.ruoyi.system.api.domain.vo.MgtShopIdByCodeVo;
 
 import java.util.List;
 
@@ -31,9 +31,9 @@
 
     /**
      * 创建商户
-     * @param MGTEditShopDto
+     * @param mgtEditShopDto
      */
-    void createShop(MgtEditShopDto MGTEditShopDto);
+    void createShop(MgtEditShopDto mgtEditShopDto);
 
     /**
      * 修改合作时间
@@ -47,7 +47,7 @@
      * @param mgtShopPageDto
      * @return
      */
-    List<MgtShopPageVo> pageShop(Page page, MgtShopPageDto mgtShopPageDto);
+    List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto);
 
     /**
      * 获取商户详情
@@ -70,9 +70,63 @@
     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);
+
+    /**
+     * @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);
+
+    /**
+     * @description  通过code获取shopId
+     * @author  jqs
+     * @date    2023/6/9 16:40
+     * @param mgtShopIdByCodeDto
+     * @return  MgtShopIdByCodeVo
+     */
+    MgtShopIdByCodeVo getShopIdByCode(MgtShopIdByCodeDto mgtShopIdByCodeDto);
+
+    /**
+     * @description  获取商户list
+     * @author  jqs
+     * @date    2023/6/12 14:37
+     * @param mgtShopListDto
+     * @return  List<MgtShopListSimpleVo>
+     */
+    List<MgtShopListSimpleVo> listMgtShopSimpleVo(MgtShopListDto mgtShopListDto);
 }

--
Gitblit v1.7.1