From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
index b0a0247..53684eb 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
@@ -1,21 +1,24 @@
package com.ruoyi.member.controller.miniapp;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.member.domain.dto.AppUserAuthorizeDto;
-import com.ruoyi.member.domain.vo.AppUserAuthorizeVo;
+import com.ruoyi.member.domain.vo.AppSuggestPageVo;
import com.ruoyi.member.domain.vo.AppUserInfoVo;
import com.ruoyi.member.service.member.MemberService;
+import com.ruoyi.member.service.member.MemberSuggestService;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
-import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.api.domain.poji.sys.SysUser;
+import com.ruoyi.system.api.domain.dto.AppSuggestPageDto;
+import com.ruoyi.system.api.domain.dto.AppUserSuggestDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* @author jqs34
@@ -29,18 +32,14 @@
@RequestMapping("/app/member")
public class AppMemberController {
- @Autowired
+ @Resource
private MemberService memberService;
+ @Resource
+ private MemberSuggestService memberSuggestService;
- @RequestMapping(value = "/getAppUserAuthorize", method = RequestMethod.POST)
- @ApiOperation(value = "获取用户授权信息")
- public R<AppUserAuthorizeVo> getAppUserAuthorize(@RequestBody AppUserAuthorizeDto appUserAuthorizeDto) {
- Long userId = SecurityUtils.getUserId();
- appUserAuthorizeDto.setUserId(userId);
- AppUserAuthorizeVo appUserAuthorizeVo = memberService.getAppUserAuthorize(appUserAuthorizeDto);
- return R.ok(appUserAuthorizeVo);
- }
+
+
@RequestMapping(value = "/getAppUserInfo", method = RequestMethod.POST)
@ApiOperation(value = "获取用户信息")
@@ -59,4 +58,24 @@
return R.ok();
}
+ @RequestMapping(value = "/pageAppUserSuggest", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取用户建议列表")
+ public R<Page<AppSuggestPageVo>> pageAppUserSuggest(@RequestBody AppSuggestPageDto appSuggestPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ appSuggestPageDto.setUserId(userId);
+ Page<AppSuggestPageVo> page = new Page<>();
+ page.setSize(appSuggestPageDto.getPageSize());
+ page.setCurrent(appSuggestPageDto.getPageNum());
+ List<AppSuggestPageVo> appSuggestPageVoList = memberSuggestService.pageAppUserSuggest(page,appSuggestPageDto);
+ return R.ok(page.setRecords(appSuggestPageVoList));
+ }
+
+ @RequestMapping(value = "/userSuggest", method = RequestMethod.POST)
+ @ApiOperation(value = "用户发起建议")
+ public R userSuggest(@RequestBody AppUserSuggestDto appUserSuggestDto) {
+ Long userId = SecurityUtils.getUserId();
+ appUserSuggestDto.setUserId(userId);
+ memberSuggestService.userSuggest(appUserSuggestDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1