From 8059e9b991c15edbac508e6b658a0d9571d11b1c Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 01 八月 2025 12:46:00 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java | 101 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 89 insertions(+), 12 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 2ccd4a4..cd47875 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,12 +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.MgtMapIntTotalVo;
-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;
@@ -38,7 +38,7 @@
* @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);
/**
@@ -54,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 平台获取商户分成列表
@@ -91,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获取商户列表
@@ -120,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
@@ -129,7 +152,7 @@
* @author jqs34
* @date 2023/6/18 17:01
*/
- MgtBulletinBoardVo shopTotal();
+ MgtBulletinBoardVo shopTotal(@Param("userIds") List<Long> userIds);
/**
* @description 获取平台商户统计
@@ -137,7 +160,7 @@
* @date 2023/6/21 16:25
* @return MgtPlTotalShopTotalVo
*/
- MgtPlTotalShopTotalVo getPlTotalShopTotal();
+ MgtPlTotalShopTotalVo getPlTotalShopTotal(@Param("userIds") List<Long> userIds);
/**
* @description 获取统计关联shopId
@@ -185,13 +208,13 @@
List<MgtMapIntTotalVo> listShopAreaRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
/**
- * @description 商户类型统计
+ * @description 销售排行
* @author jqs
* @date 2023/6/21 17:40
* @param
* @return List<MgtMapIntTotalVo>
*/
- List<MgtMapIntTotalVo> listShopSalesRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+ List<Long> listShopSalesRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
/**
* @description 商户类型统计
@@ -219,7 +242,7 @@
* @param userIdList
* @return StaffShopSimpleTotalVo
*/
- StaffShopSimpleTotalVo getStaffSimpleTotal(@Param("userIdList")List<Long> userIdList);
+ StaffShopSimpleTotalVo getStaffSimpleTotal(@Param("shopType")Integer shopType,@Param("userIdList")List<Long> userIdList);
/**
* @description 获取员工端商户数量统计
@@ -238,4 +261,58 @@
* @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);
+
+ List<Long> getShopListBySignAreaCodes(@Param("list")List<String> areaCodes);
+
+ void updateBelongShopIdBatch(@Param("list")List<Long> shopIds, @Param("shopId")Long shopId);
}
--
Gitblit v1.7.1