From 3183d1a910d72eefb96d4cb72f556a54a5d2f874 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 25 五月 2023 11:42:39 +0800
Subject: [PATCH] 完善数据库和框架
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 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 410aa51..bb5a959 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,13 +2,15 @@
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.member.service.member.MemberCouponService;
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.domain.vo.AppMemberCouponVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import io.swagger.annotations.ApiOperation;
@@ -25,7 +27,7 @@
private MemberService memberService;
@Autowired
- private UserCouponService userCouponService;
+ private MemberCouponService memberCouponService;
/**
* @description: getMember
@@ -59,24 +61,44 @@
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: TODO
+ * @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);
+ @PostMapping("/listVoMemberCouponByUserId")
+ public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(@RequestBody Long userId){
+ List<AppMemberCouponVo> appMemberCouponVoList = memberCouponService.listVoMemberCouponByUserId(userId);
+ return R.ok(appMemberCouponVoList);
}
+ /**
+ * 更新会员绑定商户
+ * @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