From dde5ffcf56ba046b8f1870ad148341519f8d469a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Sep 2021 19:04:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 66afb2c..775c46a 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -1,18 +1,21 @@
package cc.mrbird.febs.mall.controller;
import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.mall.dto.ForgetPwdDto;
+import cc.mrbird.febs.mall.dto.ModifyMemberInfoDto;
+import cc.mrbird.febs.mall.dto.MoneyFlowDto;
+import cc.mrbird.febs.mall.dto.TeamListDto;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.vo.MallMemberVo;
+import cc.mrbird.febs.mall.vo.MoneyFlowVo;
+import cc.mrbird.febs.mall.vo.TeamListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* @author wzy
@@ -43,7 +46,38 @@
}
@ApiOperation(value = "获取购物车、订单等角标数量")
+ @GetMapping(value = "/findMarkCnt")
public FebsResponse findMarkCnt() {
- return null;
+ return memberService.findMemberMarkCnt();
+ }
+
+ @ApiOperation(value = "设置支付密码")
+ @PostMapping(value = "/setTradePwd")
+ public FebsResponse setTradePwd(@RequestBody ForgetPwdDto forgetPwdDto) {
+ return memberService.setTradePwd(forgetPwdDto);
+ }
+
+ @ApiOperation(value = "修改用户信息")
+ @PostMapping(value = "/modifyInfo")
+ public FebsResponse modifyInfo(ModifyMemberInfoDto modifyMemberInfoDto) {
+ return memberService.modifyMemberInfo(modifyMemberInfoDto);
+ }
+
+ @ApiOperation(value = "我的团队列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = TeamListVo.class)
+ })
+ @PostMapping(value = "/teamList")
+ public FebsResponse teamList(@RequestBody TeamListDto teamListDto) {
+ return memberService.teamList(teamListDto);
+ }
+
+ @ApiOperation(value = "资金流水列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = MoneyFlowVo.class)
+ })
+ @PostMapping(value = "/moneyFlow")
+ public FebsResponse moneyFlow(@RequestBody MoneyFlowDto moneyFlowDto) {
+ return memberService.moneyFlows(moneyFlowDto);
}
}
--
Gitblit v1.9.1