From 5fb2ee28f798aeb69f47c7c2639daf7168f0ba00 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 09 Jan 2023 10:41:19 +0800 Subject: [PATCH] 20221227 充值归集 --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java index 215b2cd..c46244e 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java @@ -5,10 +5,7 @@ import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.common.entity.QueryRequest; import cc.mrbird.febs.mall.dto.*; -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.entity.*; import cc.mrbird.febs.mall.service.IAdminMallMemberService; import cc.mrbird.febs.mall.service.IApiMallMemberService; import cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo; @@ -349,6 +346,13 @@ return new FebsResponse().success().message("操作成功"); } + @PostMapping("updateShopApply") + @ControllerEndpoint(operation = "商户申请编辑", exceptionMessage = "操作失败") + public FebsResponse updateShopApply(@Valid MallShopApply apply) { + mallMemberService.updateShopApply(apply); + return new FebsResponse().success(); + } + @PostMapping("/refererIdUpdate") @ControllerEndpoint(operation = "修改推荐人", exceptionMessage = "修改失败") public FebsResponse refererIdUpdate(MallMember member) { @@ -368,4 +372,14 @@ return new FebsResponse().success(); } + /** + * 充值列表 + * + */ + @GetMapping("getChargeList") + public FebsResponse getChargeList(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) { + Map<String, Object> data = getDataTable(mallMemberService.getChargeList(memberCoinChargeEntity, request)); + return new FebsResponse().success().data(data); + } + } -- Gitblit v1.9.1