From 924242a73d62d247f7055ffd0dd86a2700757f5b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 12 六月 2023 18:06:51 +0800
Subject: [PATCH] 基础配置 管理台联调bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 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 71e1296..a04a98c 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
@@ -3,10 +3,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.MgtShopIdByCodeDto;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtShopIdByCodeVo;
import java.util.List;
@@ -29,9 +31,9 @@
/**
* 创建商户
- * @param MGTEditShopDto
+ * @param mgtEditShopDto
*/
- void createShop(MgtEditShopDto MGTEditShopDto);
+ void createShop(MgtEditShopDto mgtEditShopDto);
/**
* 修改合作时间
@@ -75,6 +77,7 @@
Shop getByShopId(Long shopId);
+
/**
* 获取商户端首页统计
* @param userId
@@ -83,12 +86,47 @@
MerHomeShopTotalVo getMerHomeTotal(Long userId);
/**
- *
+ * 商户获取代理商列表
* @param page
* @param merAgencyPageDto
* @return
*/
List<MerAgencyPageVo> pageMerAgencyVo (Page page, MerAgencyPageDto merAgencyPageDto);
+ /**
+ * @description 平台获取商户分成列表
+ * @author jqs
+ * @date 2023/6/8 9:25
+ * @param page
+ * @param mgtShopProportionPageDto
+ * @return List<MgtShopProportionPageVo>
+ */
+ List<MgtShopProportionPageVo> pageMgtShopProportion(Page page, MgtShopProportionPageDto mgtShopProportionPageDto);
+ /**
+ * @description 删除商户标签
+ * @author jqs
+ * @date 2023/6/8 15:53
+ * @param shopTag
+ * @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);
}
--
Gitblit v1.7.1