From a7962f680b606fbd200550bfda679f0957f3c447 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Sep 2021 15:44:12 +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 |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 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 9a6ff62..af38471 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -2,6 +2,7 @@
 
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.mall.dto.*;
+import cc.mrbird.febs.mall.entity.MallMemberPayment;
 import cc.mrbird.febs.mall.service.IApiMallMemberService;
 import cc.mrbird.febs.mall.vo.MallMemberVo;
 import cc.mrbird.febs.mall.vo.MoneyFlowVo;
@@ -59,7 +60,7 @@
 
     @ApiOperation(value = "修改用户信息")
     @PostMapping(value = "/modifyInfo")
-    public FebsResponse modifyInfo(ModifyMemberInfoDto modifyMemberInfoDto) {
+    public FebsResponse modifyInfo(@RequestBody ModifyMemberInfoDto modifyMemberInfoDto) {
         return memberService.modifyMemberInfo(modifyMemberInfoDto);
     }
 
@@ -94,4 +95,17 @@
         memberService.withdrawal(withdrawalDto);
         return new FebsResponse().success().message("提交成功");
     }
+
+    @ApiOperation(value = "设置收款方式")
+    @PostMapping(value = "/setPayment")
+    public FebsResponse setPayment(@RequestBody MallMemberPayment mallMemberPayment) {
+        memberService.setPayment(mallMemberPayment);
+        return new FebsResponse().success().message("设置成功");
+    }
+
+    @ApiOperation(value = "获取收款方式")
+    @GetMapping(value = "/findPayment")
+    public FebsResponse findPayment() {
+        return new FebsResponse().success().data(memberService.findMemberPayment());
+    }
 }

--
Gitblit v1.9.1