From 4adb872558bb83e02d6f69d371402d344a6b0f7f Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Fri, 20 Dec 2024 15:06:49 +0800 Subject: [PATCH] refactor(mall): 优化验证码发送接口返回逻辑 --- src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 100 ++++++++++++++++++++++--------------------------- 1 files changed, 45 insertions(+), 55 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java index 5db6f44..5da3a9a 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java @@ -1,14 +1,13 @@ package cc.mrbird.febs.mall.controller; +import cc.mrbird.febs.common.annotation.SubmitRepeat; import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.mall.dto.*; -import cc.mrbird.febs.mall.entity.MallMember; -import cc.mrbird.febs.mall.entity.MallMemberPayment; import cc.mrbird.febs.mall.service.IApiMallMemberService; -import cc.mrbird.febs.mall.service.ICommonService; +import cc.mrbird.febs.mall.vo.ApiChartVo; import cc.mrbird.febs.mall.vo.MallMemberVo; import cc.mrbird.febs.mall.vo.MoneyFlowVo; -import cc.mrbird.febs.mall.vo.TeamListVo; +import cc.mrbird.febs.mall.vo.MyTeamVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; @@ -18,22 +17,16 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; - -/** - * @author wzy - * @date 2021-09-16 - **/ @Slf4j @RestController @RequestMapping(value = "/api/member") @RequiredArgsConstructor -@Api(value = "ApiMallMemberController", tags = "商城用户接口类") +@Api(value = "ApiMallMemberController", tags = "碳积分用户接口") public class ApiMallMemberController { private final IApiMallMemberService memberService; - @ApiOperation(value = "获取商城用户信息", notes = "获取商城用户信息") + @ApiOperation(value = "获取用户信息", notes = "获取用户信息") @ApiResponses({ @ApiResponse(code = 200, message = "success", response = MallMemberVo.class) }) @@ -48,12 +41,6 @@ return memberService.logout(); } - @ApiOperation(value = "获取购物车、订单等角标数量") - @GetMapping(value = "/findMarkCnt") - public FebsResponse findMarkCnt() { - return memberService.findMemberMarkCnt(); - } - @ApiOperation(value = "设置支付密码") @PostMapping(value = "/setTradePwd") public FebsResponse setTradePwd(@RequestBody ForgetPwdDto forgetPwdDto) { @@ -62,18 +49,20 @@ @ApiOperation(value = "修改用户信息") @PostMapping(value = "/modifyInfo") + @SubmitRepeat public FebsResponse modifyInfo(@RequestBody ModifyMemberInfoDto modifyMemberInfoDto) { return memberService.modifyMemberInfo(modifyMemberInfoDto); } @ApiOperation(value = "我的团队列表") @ApiResponses({ - @ApiResponse(code = 200, message = "success", response = TeamListVo.class) + @ApiResponse(code = 200, message = "success", response = MyTeamVo.class) }) @PostMapping(value = "/teamList") public FebsResponse teamList(@RequestBody TeamListDto teamListDto) { return memberService.teamList(teamListDto); } + @ApiOperation(value = "资金流水列表") @ApiResponses({ @@ -84,59 +73,60 @@ return memberService.moneyFlows(moneyFlowDto); } - @ApiOperation(value = "转账") - @PostMapping(value = "/transfer") - public FebsResponse transfer(@RequestBody @Validated TransferDto transferDto) { + @ApiOperation(value = "兑换碳币") + @PostMapping(value = "/changeScore") + @SubmitRepeat + public FebsResponse changeScore(@RequestBody @Validated CommissionChangeDto commissionChange) { + memberService.commissionChange(commissionChange); + return new FebsResponse().success().message("操作成功"); + } + + @ApiOperation(value = "转赠好友") + @PostMapping(value = "/giveFriend") + @SubmitRepeat + public FebsResponse giveFriend(@RequestBody @Validated TransferDto transferDto) { memberService.transfer(transferDto); - return new FebsResponse().success().message("转账成功"); + return new FebsResponse().success().message("操作成功"); } - @ApiOperation(value = "提现") - @PostMapping(value = "/withdrawal") - public FebsResponse withdrawal(@RequestBody @Validated WithdrawalDto withdrawalDto) { - memberService.withdrawal(withdrawalDto); - return new FebsResponse().success().message("提交成功"); - } - @ApiOperation(value = "设置收款方式") + @ApiOperation(value = "地址新增和编辑") @PostMapping(value = "/setPayment") - public FebsResponse setPayment(@RequestBody MallMemberPayment mallMemberPayment) { + @SubmitRepeat + public FebsResponse setPayment(@RequestBody ApiMallMemberPaymentDto mallMemberPayment) { memberService.setPayment(mallMemberPayment); - return new FebsResponse().success().message("设置成功"); + return new FebsResponse().success().message("操作成功"); } - @ApiOperation(value = "获取收款方式") + @ApiOperation(value = "获取地址列表") @GetMapping(value = "/findPayment") public FebsResponse findPayment() { return new FebsResponse().success().data(memberService.findMemberPayment()); } - @ApiOperation(value = "绑定手机号") - @PostMapping(value = "/bindPhone") - public FebsResponse bindPhone(@RequestBody AccountAndCodeDto accountAndCodeDto) { - memberService.bindPhone(accountAndCodeDto); - return new FebsResponse().success().message("绑定成功"); + @ApiOperation(value = "地址删除") + @PostMapping(value = "/delPayment") + @SubmitRepeat + public FebsResponse delPayment(@RequestBody ApiMallMemberPaymentDto mallMemberPayment) { + memberService.delPayment(mallMemberPayment); + return new FebsResponse().success().message("操作成功"); } - @ApiOperation(value = "可提现金额") - @GetMapping(value = "/canWithdrawal") - public FebsResponse canWithdrawal() { - return new FebsResponse().success().data(memberService.canMoney()); + @ApiOperation(value = "兑换提现") + @PostMapping(value = "/withdrawal") + @SubmitRepeat + public FebsResponse withdrawal(@RequestBody @Validated WithdrawalDto withdrawalDto) { + memberService.withdrawal(withdrawalDto); + return new FebsResponse().success().message("操作成功"); } - @ApiOperation(value = "用户消费排名") - @PostMapping(value = "/findRankList") - public FebsResponse findRankList(@RequestBody RankListDto rankListDto) { - return new FebsResponse().success().data(memberService.findRankList(rankListDto)); + @ApiOperation(value = "榜单") + @ApiResponses({ + @ApiResponse(code = 200, message = "success", response = ApiChartVo.class) + }) + @PostMapping(value = "/record") + public FebsResponse record(@RequestBody @Validated ApiRecordDto apiRecordDto) { + return new FebsResponse().success().data(memberService.dayRecord(apiRecordDto)); } - @ApiOperation(value = "根据邀请码或者手机号获取昵称") - @PostMapping(value = "/findMemberInfoByAccount/{phone}") - public FebsResponse findMemberInfoByAccount(@PathVariable("phone") String phone) { - MallMember account = memberService.findMemberInfoByAccount(phone); - if (account == null) { - return new FebsResponse().fail().message("用户不存在"); - } - return new FebsResponse().success().data(account.getName()); - } } -- Gitblit v1.9.1