From e9bcfdba00460e64307f422bd08303a07b90a288 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 28 May 2022 16:18:54 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
---
src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
index a447e98..48fd860 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.mall.entity.AppVersion;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
+import cc.mrbird.febs.mall.entity.MallShopApply;
import cc.mrbird.febs.mall.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -65,16 +66,6 @@
FebsResponse activateAccount(Long id);
- MallNewsInfo getNewsInfoById(long id);
-
- IPage<AdminMallNewsInfoVo> getNewInfoList(MallNewsInfo mallNewsInfo, QueryRequest request);
-
- FebsResponse addNewsInfo(MallNewsInfoDto mallNewsInfoDto);
-
- FebsResponse delNewsInfo(Long id);
-
- FebsResponse updateNewsInfo(MallNewsInfoDto mallNewsInfoDto);
-
FebsResponse updateSystemPay(MallSystemPayDto mallSystemPayDto);
AdminAgentLevelSetInfoVo getAgentLevelSetInfoByMemberId(long id);
@@ -84,4 +75,11 @@
FebsResponse resetPwd(Long id);
IPage<MallDataVo> getMallDataList(MallMember mallMember, QueryRequest request);
+
+ IPage<MallShopApply> findShopApplyListInPage(MallShopApply mallShopApply, QueryRequest request);
+
+ MallShopApply findShopApplyById(Long id);
+
+ void applyCheckAgree(Long id);
+ void applyCheckDisAgree(Long id);
}
--
Gitblit v1.9.1