From fc1f912905287cd1ff9f81207f05f158301f7563 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 15 Jun 2022 19:05:17 +0800 Subject: [PATCH] fix some problem --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 5 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 9c3f041..215b2cd 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java @@ -14,6 +14,7 @@ import cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -34,6 +35,7 @@ /** * 平台账单 + * * @param mallMember * @param request * @return @@ -46,6 +48,7 @@ /** * 会员列表 + * * @param mallMember * @param request * @return @@ -58,6 +61,7 @@ /** * 会员列表---禁止 + * * @param id * @return */ @@ -69,6 +73,7 @@ /** * 会员列表---开启 + * * @param id * @return */ @@ -78,13 +83,25 @@ return mallMemberService.openAccount(id); } + @GetMapping("changeIdentityYes/{type}/{id}") + public FebsResponse changeIdentityYes(@PathVariable("type") Integer type, @PathVariable("id") Long id) { + mallMemberService.changeIdentity(type, id, 1); + return new FebsResponse().success(); + } + + @GetMapping("changeIdentityNo/{type}/{id}") + public FebsResponse changeIdentityNo(@PathVariable("type") Integer type, @PathVariable("id") Long id) { + mallMemberService.changeIdentity(type, id, 2); + return new FebsResponse().success(); + } + /** * 会员列表-资金流水 */ @GetMapping("/moneyFlow") public FebsResponse moneyFlow(QueryRequest request, MallMember mallMember, Integer parentId) { - if(parentId==null){ - ViewMallMemberController.idFromMoneyFlow=0; + if (parentId == null) { + ViewMallMemberController.idFromMoneyFlow = 0; } mallMember.setId(ViewMallMemberController.idFromMoneyFlow); Map<String, Object> dataTable = getDataTable(mallMemberService.moneyFlow(request, mallMember)); @@ -111,6 +128,7 @@ /** * 资金流水-列表 + * * @param moneyFlowListDto * @param request * @return @@ -123,6 +141,7 @@ /** * 会员提现-列表 + * * @param moneyChargeListDto * @param request * @return @@ -135,6 +154,7 @@ /** * 会员提现-同意 + * * @param id * @return */ @@ -146,6 +166,7 @@ /** * 会员提现-拒绝 + * * @param id * @return */ @@ -157,6 +178,7 @@ /** * 代理列表 + * * @param agentDto * @param request * @return @@ -169,6 +191,7 @@ /** * 代理级别-列表 + * * @param agentLevelDto * @param request * @return @@ -193,7 +216,7 @@ */ @GetMapping("getAgentLevelOption/tree") @ControllerEndpoint(exceptionMessage = "获取等级失败") - public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption(){ + public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption() { return mallMemberService.getAgentLevelOption(); } @@ -203,8 +226,8 @@ */ @GetMapping("/agentChild") public FebsResponse agentChild(QueryRequest request, MallMember mallMember, Integer parentId) { - if(parentId==null){ - ViewMallMemberController.idFromAgentAllMember=0; + if (parentId == null) { + ViewMallMemberController.idFromAgentAllMember = 0; } mallMember.setId(ViewMallMemberController.idFromAgentAllMember); Map<String, Object> dataTable = getDataTable(mallMemberService.agentChild(request, mallMember)); @@ -213,6 +236,7 @@ /** * 代理列表---激活 + * * @param id * @return */ @@ -233,6 +257,7 @@ /** * 奖励设置-列表 + * * @param rankAwardDto * @param request * @return @@ -254,6 +279,7 @@ /** * App版本-列表 + * * @param appVersion * @param request * @return -- Gitblit v1.9.1