联调bug和订单管理

jiangqs

2023-06-16 ae41759bafec1c2a1e8858fcdcda4272ed4eb84c

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java

@@ -3,27 +3,21 @@
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.dto.MerCashMemberPageDto;
import com.ruoyi.member.domain.vo.AppSuggestPageVo;
import com.ruoyi.member.domain.vo.AppUserAuthorizeVo;
import com.ruoyi.member.domain.vo.AppUserInfoVo;
import com.ruoyi.member.domain.vo.MerCashMemberPageVo;
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.dto.AppSuggestPageDto;
import com.ruoyi.system.api.domain.dto.AppUserSuggestDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
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;

/**
@@ -38,21 +32,14 @@
@RequestMapping("/app/member")
public class AppMemberController {

    @Autowired
    @Resource
    private MemberService memberService;

    @Autowired
    @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 = "获取用户信息")
@@ -84,7 +71,7 @@
    }

    @RequestMapping(value = "/userSuggest", method = RequestMethod.POST)
    @ApiOperation(value = "发起建议")
    @ApiOperation(value = "用户发起建议")
    public R userSuggest(@RequestBody AppUserSuggestDto appUserSuggestDto) {
        Long userId = SecurityUtils.getUserId();
        appUserSuggestDto.setUserId(userId);