From d4f6d9632d5405a0153b124c5047b82efbd26649 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 24 五月 2023 11:21:20 +0800
Subject: [PATCH] 用户重构
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 4 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 551f484..ce77d77 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
@@ -2,14 +2,22 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
+import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
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.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@RestController
@RequestMapping("/member")
@@ -18,6 +26,9 @@
@Autowired
private MemberService memberService;
+ @Autowired
+ private UserCouponService userCouponService;
+
/**
* @description: getMember
* @param: userId
@@ -25,8 +36,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);
@@ -39,7 +50,6 @@
/**
* 小程序登录
*/
- @InnerAuth
@PostMapping("/miniLogin")
@ApiOperation("小程序登录")
public R<AppMiniLoginVo> getMemberByCode(@RequestBody AppMiniLoginDto appMiniLoginDto)
@@ -50,4 +60,45 @@
}
return R.ok(appMiniLoginVo);
}
+
+ @PostMapping(value = "/miniRegister")
+ @ApiOperation(value = "小程序注册")
+ public R<AppMiniRegisterVo> miniRegister(@RequestBody AppMiniRegisterDto appUserRegisterDto) {
+ AppMiniRegisterVo appUserRegisterVo = memberService.miniRegister(appUserRegisterDto);
+ if(appUserRegisterVo ==null){
+ return R.fail("注册失败！");
+ }
+ return R.ok(appUserRegisterVo);
+ }
+
+ /**
+ * @description: 获取用户优惠券
+ * @author jqs34
+ * @date 2023/5/3 1:45
+ * @version 1.0
+ */
+ @PostMapping("/listVoUserCouponByUserId")
+ public R<List<AppUserCouponVo>> listVoUserCouponByUserId(@RequestBody Long userId){
+ 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