From 43d9975c99cb947b4602f05bc2e513a20de92c38 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 06 五月 2023 20:30:42 +0800
Subject: [PATCH] 商户端主流程
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 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 e1cb20a..410aa51 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
@@ -4,15 +4,18 @@
import com.ruoyi.common.core.web.controller.BaseController;
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.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;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@RestController
@RequestMapping("/member")
@@ -21,6 +24,9 @@
@Autowired
private MemberService memberService;
+ @Autowired
+ private UserCouponService userCouponService;
+
/**
* @description: getMember
* @param: userId
@@ -28,8 +34,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);
@@ -38,4 +44,39 @@
}
return R.ok(member);
}
+
+ /**
+ * 小程序登录
+ */
+ @PostMapping("/miniLogin")
+ @ApiOperation("小程序登录")
+ public R<AppMiniLoginVo> getMemberByCode(@RequestBody AppMiniLoginDto appMiniLoginDto)
+ {
+ AppMiniLoginVo appMiniLoginVo = memberService.getMemberByCode(appMiniLoginDto);
+ if(appMiniLoginVo ==null){
+ return R.fail("登录失败！");
+ }
+ return R.ok(appMiniLoginVo);
+ }
+
+ /**
+ * @description: TODO
+ * @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("/updateMemberBinding")
+ public R updateMemberBinding(@RequestBody AppMemberBindingDto appMemberBindingDto)
+ {
+ memberService.updateMemberBinding(appMemberBindingDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1