From c203ff63489126a94d1be5dbfe32cadb69a70594 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 25 五月 2023 16:26:56 +0800
Subject: [PATCH] 完善数据库和框架

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java |   66 ++++++++++++++++++++++++++++----
 1 files changed, 57 insertions(+), 9 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 77e818e..e8a8451 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,16 +61,26 @@
         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);
+    @PostMapping("/listVoMemberCouponByUserId")
+    public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(@RequestBody Long userId){
+        List<AppMemberCouponVo> appMemberCouponVoList = memberCouponService.listVoMemberCouponByUserId(userId);
+        return R.ok(appMemberCouponVoList);
     }
 
     /**
@@ -82,4 +94,40 @@
         memberService.updateMemberBinding(appMemberBindingDto);
         return R.ok();
     }
+
+    /**
+     * 更新会员商品类型
+     * @param appMemberGoodsTypeDto
+     * @return
+     */
+    @PostMapping("/updateMemberGoodsType")
+    public R updateMemberGoodsType(@RequestBody AppMemberGoodsTypeDto appMemberGoodsTypeDto)
+    {
+        memberService.updateMemberGoodsType(appMemberGoodsTypeDto);
+        return R.ok();
+    }
+
+    /**
+     * 通过手机号获取会员
+     * @param mobile
+     * @return
+     */
+    @PostMapping("/getMemberByMobile")
+    public R<Member> getMemberByMobile(@RequestBody String mobile)
+    {
+        Member member = memberService.getByMobile(mobile);
+        return R.ok(member);
+    }
+
+    /**
+     * 订单创建新用户
+     * @param member
+     * @return
+     */
+    @PostMapping("/createNewMember")
+    public R createNewMember(@RequestBody Member member)
+    {
+        memberService.createNewMember(member);
+        return R.ok();
+    }
 }

--
Gitblit v1.7.1