From 1d2139950d2ef8867c39fa8c8e9af8db178eaa27 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 19 五月 2023 16:21:14 +0800
Subject: [PATCH] demo补完

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
index 2065696..993c268 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
@@ -5,8 +5,11 @@
 import com.ruoyi.common.security.annotation.InnerAuth;
 import com.ruoyi.member.service.member.MemberService;
 import com.ruoyi.member.service.member.UserCouponService;
+import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
+import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto;
 import com.ruoyi.system.api.domain.poji.member.Member;
 import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
 import com.ruoyi.system.api.model.AppMiniLoginDto;
 import com.ruoyi.system.api.model.AppMiniLoginVo;
 import io.swagger.annotations.ApiOperation;
@@ -32,8 +35,8 @@
     * @author jqs34
     * @date: 2023/4/30 12:49
     */
-    @InnerAuth
-    @GetMapping("/getMember")
+
+    @PostMapping("/getMember")
     public R<Member> getMember(@RequestBody Long userId)
     {
         Member member = memberService.getByUserId(userId);
@@ -58,7 +61,7 @@
     }
 
     /**
-    * @description: TODO
+    * @description: 获取用户优惠券
     * @author jqs34
     * @date 2023/5/3 1:45
     * @version 1.0
@@ -68,4 +71,23 @@
         List<AppUserCouponVo> appUserCouponVoList = userCouponService.listVoUserCouponByUserId(userId);
         return R.ok(appUserCouponVoList);
     }
+
+    /**
+     * 更新会员绑定商户
+     * @param appMemberBindingDto
+     * @return
+     */
+    @PostMapping("/updateMemberBinding")
+    public R updateMemberBinding(@RequestBody AppMemberBindingDto appMemberBindingDto)
+    {
+        memberService.updateMemberBinding(appMemberBindingDto);
+        return R.ok();
+    }
+
+    @PostMapping("/updateMemberGoodsType")
+    public R updateMemberGoodsType(@RequestBody AppMemberGoodsTypeDto appMemberGoodsTypeDto)
+    {
+        memberService.updateMemberGoodsType(appMemberGoodsTypeDto);
+        return R.ok();
+    }
 }

--
Gitblit v1.7.1