From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java |  207 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 200 insertions(+), 7 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 6d419c5..4f6f949 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
@@ -4,10 +4,12 @@
 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.dto.MGtOneClinkSyncingShopPageDTO;
+import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
 import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto;
+import com.ruoyi.system.api.domain.poji.config.OneClinkSyncing;
 import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
-import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
+import com.ruoyi.system.api.domain.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -21,13 +23,22 @@
  * @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
      * @param mgtShopPageDto
      * @return
      */
-    List<MgtShopPageVo> pageMgtShop(Page page, @Param("param") MgtShopPageDto mgtShopPageDto);
+    List<MgtShopPageVo> pageMgtShop(Page page, @Param("param") MgtShopPageDto mgtShopPageDto,@Param("list") List<Long> scope, @Param("associatedAccount")List<Integer> associatedAccount);
 
 
     /**
@@ -43,7 +54,16 @@
      * @param appNearbyShopDto
      * @return
      */
-    AppNearShopVo getNearbyShop(@Param("param")AppNearbyShopDto appNearbyShopDto);
+    List<AppNearShopVo> getNearbyShop(@Param("param")AppNearbyShopDto appNearbyShopDto);
+
+
+    /**
+     * 获取最近商户
+     * @param appNearbyShopDto
+     * @return
+     */
+    List<AppNearShopVo> getNearbyShops(@Param("param")AppNearbyShopDto appNearbyShopDto);
+
 
     /**
      * @description  平台获取商户分成列表
@@ -80,7 +100,8 @@
      * @param mgtShopListDto
      * @return  List<MgtShopListSimpleVo>
      */
-    List<MgtShopListSimpleVo> listMgtShopSimpleVo(@Param("param")MgtShopListDto mgtShopListDto);
+    List<MgtShopListSimpleVo> listMgtShopSimpleVo(@Param("param")MgtShopListDto mgtShopListDto,
+                                                  @Param("list")List<Long> list);
 
     /**
      * @description  通过id获取商户列表
@@ -109,7 +130,20 @@
      * @author jqs34
      * @date 2023/6/15 0:05
      */
-    List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, @Param("param")MgtShopAuthPageDto mgtShopAuthPageDto);
+    List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, @Param("param")MgtShopAuthPageDto mgtShopAuthPageDto,
+                                            @Param("list")List<Long> scope);
+
+
+    /**
+     * 商户进件列表数据(汇付天下)
+     * @param page
+     * @param mgtShopAuthPageDto
+     * @return
+     */
+    List<MgtShopHFTXAuthPageVo> pageMgtShopHFTXAuth(Page page, @Param("param") MgtShopHFTXAuthPageDto mgtShopAuthPageDto,
+                                                    @Param("list")List<Long> scope);
+
+
 
     /**
     * @description shopTotal
@@ -118,5 +152,164 @@
     * @author jqs34
     * @date 2023/6/18 17:01
     */
-    MgtBulletinBoardVo shopTotal();
+    MgtBulletinBoardVo shopTotal(@Param("userIds") List<Long> userIds);
+
+    /**
+     * @description  获取平台商户统计
+     * @author  jqs
+     * @date    2023/6/21 16:25
+     * @return  MgtPlTotalShopTotalVo
+     */
+    MgtPlTotalShopTotalVo getPlTotalShopTotal(@Param("userIds") List<Long> userIds);
+
+    /**
+     * @description  获取统计关联shopId
+     * @author  jqs
+     * @date    2023/6/21 16:45
+     * @param mgtBasePlatformDto
+     * @return  List<Long>
+     */
+    List<Long> listShopIdByTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+    /**
+     * @description  获取统计关联shopId
+     * @author  jqs
+     * @date    2023/6/21 16:45
+     * @param mgtBasePlatformDto
+     * @return  List<Long>
+     */
+    List<Long> listShopIdByPlTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+    /**
+     * @description  商户类型统计
+     * @author  jqs
+     * @date    2023/6/21 17:40
+     * @param
+     * @return  List<MgtMapIntTotalVo>
+     */
+    List<MgtMapIntTotalVo> listShopTypeTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+    /**
+     * @description  商户类型统计
+     * @author  jqs
+     * @date    2023/6/21 17:40
+     * @param
+     * @return  List<MgtMapIntTotalVo>
+     */
+    List<MgtMapIntTotalVo> listShopStatusTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+    /**
+     * @description  商户类型统计
+     * @author  jqs
+     * @date    2023/6/21 17:40
+     * @param
+     * @return  List<MgtMapIntTotalVo>
+     */
+    List<MgtMapIntTotalVo> listShopAreaRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+    /**
+     * @description  销售排行
+     * @author  jqs
+     * @date    2023/6/21 17:40
+     * @param
+     * @return  List<MgtMapIntTotalVo>
+     */
+    List<Long> listShopSalesRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+    /**
+     * @description  商户类型统计
+     * @author  jqs
+     * @date    2023/6/21 17:40
+     * @param
+     * @return  List<MgtMapIntTotalVo>
+     */
+    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("shopType")Integer shopType,@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);
+
+    /**
+     * @description
+     * @author  jqs
+     * @date    2023/8/10 22:54
+     * @param cityCodes
+     * @return  List<Long>
+     */
+    List<Long> listShopIdByCityCode(List<String> cityCodes);
+
+    /**
+     * @description
+     * @author  jqs
+     * @date    2023/8/29 14:36
+     * @param
+     * @return  List<MgtUserTaskMsgVo>
+     */
+    List<MgtUserTaskMsgVo> getTaskMsgList();
+
+
+
+
+
+    /**
+     * @description
+     * @author  jqs
+     * @date    2023/8/10 22:54
+     * @param cityCodes
+     * @return  List<Long>
+     */
+    List<Shop> listShopByCityCode(@Param("cityCodes")List<String> cityCodes);
+
+    List<Shop> getFranchiseeIdsBYDealerId(@Param("shopId")Long shopId);
+
+
+    /**
+     * 设置加盟商的归属经销商为null
+     * @param shopId
+     */
+    void setBelongShopIdNull(@Param("shopId")Long shopId);
+
+    /**
+     * 根据shopIds获取一键同步的店铺信息
+     * @param page
+     * @param scope
+     * @return
+     */
+    List<MgtOneClinkSyncingShopPageVo> getMgtShopPageVoByShopIds(Page page, @Param("list") List<Long> scope);
+
+    void updateShopByOneClinkSyncing(@Param("param") OneClinkSyncing oneClinkSyncing);
+
 }

--
Gitblit v1.7.1