From c00d0d3bc399b6648145dfd955cedbea90f5f99d Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 18 六月 2023 17:38:22 +0800
Subject: [PATCH] 看板

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java |  109 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 98 insertions(+), 11 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..4674c34 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
@@ -1,14 +1,16 @@
 package com.ruoyi.shop.service.shop;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.shop.domain.dto.*;
-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.shop.domain.dto.*;
+import com.ruoyi.shop.domain.vo.*;
+import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto;
 import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
+import com.ruoyi.system.api.domain.vo.MgtShopIdByCodeVo;
+import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
 
 import java.util.List;
 
@@ -31,9 +33,9 @@
 
     /**
      * 创建商户
-     * @param MGTEditShopDto
+     * @param mgtEditShopDto
      */
-    void createShop(MgtEditShopDto MGTEditShopDto);
+    void createShop(MgtEditShopDto mgtEditShopDto);
 
     /**
      * 修改合作时间
@@ -47,7 +49,7 @@
      * @param mgtShopPageDto
      * @return
      */
-    List<MgtShopPageVo> pageShop(Page page, MgtShopPageDto mgtShopPageDto);
+    List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto);
 
     /**
      * 获取商户详情
@@ -76,10 +78,95 @@
      */
     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);
+
+    /**
+     * @description  通过id获取商户列表
+     * @author  jqs
+     * @date    2023/6/14 17:53
+     * @param shopIds
+     * @return  List<MgtSimpleShopVo>
+     */
+    List<MgtSimpleShopVo> listShopSimpleVoByIds(String shopIds);
+
+    /**
+    * @description pageMgtShopByCityCode
+    * @param page
+    * @param mgtShopByCodePageDto
+    * @return List<MgtSimpleShopVo>
+    * @author jqs34
+    * @date 2023/6/14 20:56
+    */
+    List<MgtSimpleShopVo> pageMgtShopByCityCode(Page page, MgtShopByCodePageDto mgtShopByCodePageDto);
+
+    /**
+    * @description pageMgtShopAuth
+    * @param page
+    * @param mgtShopAuthPageDto
+    * @return List<MgtShopAuthPageVo>
+    * @author jqs34
+    * @date 2023/6/15 0:05
+    */
+    List<MgtShopAuthPageVo> pageMgtShopAuth(Page page,  MgtShopAuthPageDto mgtShopAuthPageDto);
+
+    /**
+    * @description boardShopTotal
+    * @param
+    * @return MgtBulletinBoardVo
+    * @author jqs34
+    * @date 2023/6/18 17:01
+    */
+    MgtBulletinBoardVo boardShopTotal();
 }

--
Gitblit v1.7.1