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/service/shop/ShopService.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 53 insertions(+), 3 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 42750ec..7d3153a 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,12 +1,15 @@
 package com.ruoyi.shop.service.shop;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.shop.domain.dto.*;
 import com.ruoyi.shop.domain.vo.*;
-import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.baomidou.mybatisplus.extension.service.IService;
+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.MgtShopIdByCodeVo;
+import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
 
 import java.util.List;
 
@@ -45,7 +48,7 @@
      * @param mgtShopPageDto
      * @return
      */
-    List<MgtShopPageVo> pageShop(Page page, MgtShopPageDto mgtShopPageDto);
+    List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto);
 
     /**
      * 获取商户详情
@@ -109,4 +112,51 @@
      * @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);
 }

--
Gitblit v1.7.1