From 79461476f170523b9be727cf71a0261f4659d8a6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 12 Jan 2023 15:03:58 +0800
Subject: [PATCH] 20221227 充值归集
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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..9beb2e6 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) {
@@ -364,8 +368,17 @@
registerDto.setPassword("a123456");
registerDto.setInviteId(member.getInviteId());
registerDto.setName(member.getName());
- apiMallMemberService.register(registerDto);
- return new FebsResponse().success();
+ return apiMallMemberService.register(registerDto);
+ }
+
+ /**
+ * 充值列表
+ *
+ */
+ @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