From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java |   68 ++++++++++++++++++++++++++++-----
 1 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java
index 9e45473..2ccd4a4 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java
@@ -8,7 +8,7 @@
 import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto;
 import com.ruoyi.system.api.domain.poji.shop.Shop;
 import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
-import com.ruoyi.system.api.domain.vo.MgtMapTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
 import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -23,6 +23,15 @@
  * @since 2023-04-25
  */
 public interface ShopMapper extends BaseMapper<Shop> {
+    
+    /**
+     * @description  
+     * @author  jqs
+     * @date    2023/7/15 10:39
+     * @param shop
+     * @return  int
+     */
+    int updateShop(Shop shop);
     /**
      * 分页获取商户
      * @param page
@@ -153,43 +162,80 @@
      * @author  jqs
      * @date    2023/6/21 17:40
      * @param
-     * @return  List<MgtMapTotalVo>
+     * @return  List<MgtMapIntTotalVo>
      */
-    List<MgtMapTotalVo> listShopTypeTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+    List<MgtMapIntTotalVo> listShopTypeTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
 
     /**
      * @description  商户类型统计
      * @author  jqs
      * @date    2023/6/21 17:40
      * @param
-     * @return  List<MgtMapTotalVo>
+     * @return  List<MgtMapIntTotalVo>
      */
-    List<MgtMapTotalVo> listShopStatusTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+    List<MgtMapIntTotalVo> listShopStatusTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
 
     /**
      * @description  商户类型统计
      * @author  jqs
      * @date    2023/6/21 17:40
      * @param
-     * @return  List<MgtMapTotalVo>
+     * @return  List<MgtMapIntTotalVo>
      */
-    List<MgtMapTotalVo> listShopAreaRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+    List<MgtMapIntTotalVo> listShopAreaRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
 
     /**
      * @description  商户类型统计
      * @author  jqs
      * @date    2023/6/21 17:40
      * @param
-     * @return  List<MgtMapTotalVo>
+     * @return  List<MgtMapIntTotalVo>
      */
-    List<MgtMapTotalVo> listShopSalesRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+    List<MgtMapIntTotalVo> listShopSalesRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
 
     /**
      * @description  商户类型统计
      * @author  jqs
      * @date    2023/6/21 17:40
      * @param
-     * @return  List<MgtMapTotalVo>
+     * @return  List<MgtMapIntTotalVo>
      */
-    List<MgtMapTotalVo> listShopRecommendRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+    List<MgtMapIntTotalVo> listShopRecommendRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+    /**
+     * @description  员工端获取商户列表
+     * @author  jqs
+     * @date    2023/7/14 15:26
+     * @param page
+     * @param staffShopPageDto
+     * @return  List<StaffShopPageVo>
+     */
+    List<StaffShopPageVo> pageStaffShop(Page page, @Param("param")StaffShopPageDto staffShopPageDto);
+
+    /**
+     * @description  获取员工端商户数量统计
+     * @author  jqs
+     * @date    2023/7/14 15:51
+     * @param userIdList
+     * @return  StaffShopSimpleTotalVo
+     */
+    StaffShopSimpleTotalVo getStaffSimpleTotal(@Param("userIdList")List<Long> userIdList);
+
+    /**
+     * @description  获取员工端商户数量统计
+     * @author  jqs
+     * @date    2023/7/14 18:18
+     * @param userIdList
+     * @return  StaffHomeShopTotalVo
+     */
+    StaffHomeShopTotalVo getStaffHomeTotal(@Param("userIdList")List<Long> userIdList);
+
+    /**
+     * @description  更新扩展联系人
+     * @author  jqs
+     * @date    2023/7/15 11:12
+     * @param shop
+     * @return  void
+     */
+    void updateExtendContacts(Shop shop);
 }

--
Gitblit v1.7.1