From 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 13:48:56 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 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 e7162e5..5ec8cf6 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,15 +1,12 @@
package com.ruoyi.shop.service.shop;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.shop.domain.dto.MgtChangeCoopDto;
-import com.ruoyi.shop.domain.dto.MgtEditShopDto;
-import com.ruoyi.shop.domain.dto.MgtEditShopTagDto;
-import com.ruoyi.shop.domain.dto.MgtShopPageDto;
-import com.ruoyi.shop.domain.pojo.shop.Shop;
+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.shop.domain.vo.AppShopInfoVo;
-import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
-import com.ruoyi.shop.domain.vo.MgtShopPageVo;
+import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import java.util.List;
@@ -64,9 +61,35 @@
void editShopTag(MgtEditShopTagDto mgtEditShopTagDto);
/**
- * 获取商户详情
+ * 获取附近门店
+ * @param appNearbyShopDto
+ * @return
+ */
+ AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto, Member member);
+
+ /**
+ *
+ * @param shopId
+ * @return
+ */
+ Shop getByShopId(Long shopId);
+
+
+
+ /**
+ * 获取商户端首页统计
* @param userId
* @return
*/
- //MgtShopInfoVo getMerShopInfo(Long userId);
+ MerHomeShopTotalVo getMerHomeTotal(Long userId);
+
+ /**
+ *
+ * @param page
+ * @param merAgencyPageDto
+ * @return
+ */
+ List<MerAgencyPageVo> pageMerAgencyVo (Page page, MerAgencyPageDto merAgencyPageDto);
+
+
}
--
Gitblit v1.7.1