From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java | 65 +++++++++++++++++++++++++++-----
1 files changed, 54 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 43d1d08..f11cace 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
@@ -1,16 +1,12 @@
package com.ruoyi.shop.mapper.shop;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.shop.domain.dto.AppNearbyShopDto;
-import com.ruoyi.shop.domain.dto.MerAgencyPageDto;
-import com.ruoyi.shop.domain.dto.MgtShopProportionPageDto;
-import com.ruoyi.shop.domain.vo.AppNearShopVo;
-import com.ruoyi.shop.domain.vo.MerAgencyPageVo;
-import com.ruoyi.shop.domain.vo.MgtShopProportionPageVo;
-import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.shop.domain.dto.MgtShopPageDto;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.shop.domain.vo.MgtShopPageVo;
+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.MgtShopIdByCodeDto;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
+import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -30,7 +26,7 @@
* @param mgtShopPageDto
* @return
*/
- List<MgtShopPageVo> pageShop(Page page, @Param("param") MgtShopPageDto mgtShopPageDto);
+ List<MgtShopPageVo> pageMgtShop(Page page, @Param("param") MgtShopPageDto mgtShopPageDto);
/**
@@ -66,4 +62,51 @@
* @return void
*/
void deleteShopTag(String shopTag);
+
+ /**
+ * @description 通过code获取shopId
+ * @author jqs
+ * @date 2023/6/9 16:40
+ * @param mgtShopIdByCodeDto
+ * @return MgtShopIdByCodeVo
+ */
+ List<Long> getShopIdByCode(@Param("param")MgtShopIdByCodeDto mgtShopIdByCodeDto);
+
+ /**
+ * @description 获取商户list
+ * @author jqs
+ * @date 2023/6/12 14:37
+ * @param mgtShopListDto
+ * @return List<MgtShopListSimpleVo>
+ */
+ List<MgtShopListSimpleVo> listMgtShopSimpleVo(@Param("param")MgtShopListDto mgtShopListDto);
+
+ /**
+ * @description 通过id获取商户列表
+ * @author jqs
+ * @date 2023/6/14 17:53
+ * @param shopIds
+ * @return List<MgtSimpleShopVo>
+ */
+ List<MgtSimpleShopVo> listShopSimpleVoByIds(@Param("shopIds")String shopIds);
+
+ /**
+ * @description pageMgtShopByCityCode
+ * @param page
+ * @param mgtShopByCodePageDto
+ * @return List<MgtSimpleShopVo>
+ * @author jqs34
+ * @date 2023/6/14 20:56
+ */
+ List<MgtSimpleShopVo> pageMgtShopByCityCode(Page page, @Param("param")MgtShopByCodePageDto mgtShopByCodePageDto);
+
+ /**
+ * @description pageMgtShopAuth
+ * @param page
+ * @param mgtShopAuthPageDto
+ * @return List<MgtShopAuthPageVo>
+ * @author jqs34
+ * @date 2023/6/15 0:05
+ */
+ List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, @Param("param")MgtShopAuthPageDto mgtShopAuthPageDto);
}
--
Gitblit v1.7.1