bug

jiangqs

2023-08-25 156e141e55a8abf486157d1fa89d25e23f4a06a3

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java

@@ -2,25 +2,24 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.dto.MgtMemberIntEditDto;
import com.ruoyi.member.domain.dto.MgtMemberPageDto;
import com.ruoyi.member.domain.dto.MgtMemberRelDelDto;
import com.ruoyi.member.domain.dto.MgtMemberRelEditDto;
import com.ruoyi.member.domain.vo.MerMemberInfoVo;
import com.ruoyi.member.domain.vo.MgtMemberGetVo;
import com.ruoyi.member.domain.vo.MgtMemberPageVo;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
import com.ruoyi.member.domain.dto.*;
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.service.member.*;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto;
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 javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
@@ -36,8 +35,20 @@
public class MgtMemberController {


    @Autowired
    @Resource
    private MemberService memberService;

    @Resource
    private IntegralRecordService integralRecordService;

    @Resource
    private BrowseRecordService browseRecordService;

    @Resource
    private MemberArchiveFieldsService memberArchiveFieldsService;

    @Resource
    private MemberSuggestService memberSuggestService;


    @RequestMapping(value = "/pageMgtMember", method = RequestMethod.POST)
@@ -50,7 +61,24 @@
        return R.ok(page.setRecords(mgtShopPageVoList));
    }

    @RequestMapping(value = "/exportPageMgtMember", method = RequestMethod.POST)
    @ApiOperation(value = "导出会员列表")
    public void exportPageMgtMember(MgtMemberPageDto mgtMemberPageDto, HttpServletResponse response) {
        Page<MgtMemberPageVo> page = new Page<>();
        if(mgtMemberPageDto.getPageSize() > 5000){
            page.setSize(5000);
            page.setCurrent(1);
        }else{
            page.setSize(mgtMemberPageDto.getPageSize());
            page.setCurrent(mgtMemberPageDto.getPageNum());
        }
        List<MgtMemberPageVo> mgtShopPageVoList = memberService.pageMgtMember(page,mgtMemberPageDto);
        ExcelUtil<MgtMemberPageVo> util = new ExcelUtil<MgtMemberPageVo>(MgtMemberPageVo.class);
        util.exportExcel(response, mgtShopPageVoList, "用户管理");
    }

    @RequestMapping(value = "/editMemberRelationShop", method = RequestMethod.POST)
    @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "修改会员关联商户")
    @ApiOperation(value = "修改会员关联商户")
    public R<MerMemberInfoVo> getMerMemberInfo(@RequestBody MgtMemberRelEditDto mgtMemberRelEditDto) {
        Long userId = SecurityUtils.getUserId();
@@ -60,6 +88,7 @@
    }

    @RequestMapping(value = "/deleteMemberRelationShop", method = RequestMethod.POST)
    @Log(title = "会员管理", businessType = BusinessType.DELETE,operContent = "删除会员关联商户")
    @ApiOperation(value = "删除会员关联商户")
    public R<MerMemberInfoVo> deleteMemberRelationShop(@RequestBody MgtMemberRelDelDto mgtMemberRelDelDto) {
        Long userId = SecurityUtils.getUserId();
@@ -69,7 +98,8 @@
    }

    @RequestMapping(value = "/editMemberIntegral", method = RequestMethod.POST)
    @ApiOperation(value = "修改会员关联商户")
    @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "修改会员积分")
    @ApiOperation(value = "修改会员积分")
    public R<MerMemberInfoVo> editMemberIntegral(@RequestBody MgtMemberIntEditDto mgtMemberIntEditDto) {
        Long userId = SecurityUtils.getUserId();
        mgtMemberIntEditDto.setUserId(userId);
@@ -86,8 +116,159 @@
        return R.ok(mgtMemberGetVo);
    }

    @RequestMapping(value = "/listMgtArchiveFields", method = RequestMethod.POST)
    @ApiOperation(value = "平台获取档案字段")
    public R<List<MgtArchiveFieldsListVo>> listMgtArchiveFields() {
        List<MgtArchiveFieldsListVo> archiveFieldsListVoList = memberArchiveFieldsService.listMgtArchiveFields();
        return R.ok(archiveFieldsListVoList);
    }

    @RequestMapping(value = "/pageMgtMemberIntegral", method = RequestMethod.POST)
    @ApiOperation(value = "平台获取用户积分列表")
    public R<Page<MgtMemberIntegralPageVo>> pageMgtMemberIntegral(@RequestBody MgtMemberIntegralPageDto mgtMemberIntegralPageDto) {
        Long userId = SecurityUtils.getUserId();
        mgtMemberIntegralPageDto.setUserId(userId);
        Page<MgtMemberIntegralPageVo> page = new Page<>();
        if(mgtMemberIntegralPageDto.getPageSize() > 5000){
            page.setSize(5000);
            page.setCurrent(1);
        }else{
            page.setSize(mgtMemberIntegralPageDto.getPageSize());
            page.setCurrent(mgtMemberIntegralPageDto.getPageNum());
        }
        List<MgtMemberIntegralPageVo> mgtMemberIntegralPageVoList = integralRecordService.pageMgtMemberIntegral(page,mgtMemberIntegralPageDto);
        return R.ok(page.setRecords(mgtMemberIntegralPageVoList));
    }

    @RequestMapping(value = "/exportPageMgtMemberIntegral", method = RequestMethod.POST)
    @ApiOperation(value = "导出用户积分列表")
    public void exportPageMgtMemberIntegral( MgtMemberIntegralPageDto mgtMemberIntegralPageDto, HttpServletResponse response) {
        Long userId = SecurityUtils.getUserId();
        mgtMemberIntegralPageDto.setUserId(userId);
        Page<MgtMemberIntegralPageVo> page = new Page<>();
        page.setSize(mgtMemberIntegralPageDto.getPageSize());
        page.setCurrent(mgtMemberIntegralPageDto.getPageNum());
        List<MgtMemberIntegralPageVo> mgtMemberIntegralPageVoList = integralRecordService.pageMgtMemberIntegral(page,mgtMemberIntegralPageDto);
        ExcelUtil<MgtMemberIntegralPageVo> util = new ExcelUtil<MgtMemberIntegralPageVo>(MgtMemberIntegralPageVo.class);
        util.exportExcel(response, mgtMemberIntegralPageVoList, "用户积分列表");
    }

    @RequestMapping(value = "/pageMgtMemberBrowse", method = RequestMethod.POST)
    @ApiOperation(value = "平台获取用户浏览记录")
    public R<Page<MgtMemberBrowsePageVo>> pageMgtMemberBrowse(@RequestBody MgtMemberBrowsePageDto mgtMemberBrowsePageDto) {
        Long userId = SecurityUtils.getUserId();
        mgtMemberBrowsePageDto.setUserId(userId);
        Page<MgtMemberBrowsePageVo> page = new Page<>();
        page.setSize(mgtMemberBrowsePageDto.getPageSize());
        page.setCurrent(mgtMemberBrowsePageDto.getPageNum());
        List<MgtMemberBrowsePageVo> mgtMemberBrowsePageVoList = browseRecordService.pageMgtMemberBrowse(page,mgtMemberBrowsePageDto);
        return R.ok(page.setRecords(mgtMemberBrowsePageVoList));
    }

    @RequestMapping(value = "/exportPageMgtMemberBrowse", method = RequestMethod.POST)
    @ApiOperation(value = "导出用户浏览记录")
    public void exportPageMgtMemberBrowse( MgtMemberBrowsePageDto mgtMemberBrowsePageDto, HttpServletResponse response) {
        Long userId = SecurityUtils.getUserId();
        mgtMemberBrowsePageDto.setUserId(userId);
        Page<MgtMemberBrowsePageVo> page = new Page<>();
        if(mgtMemberBrowsePageDto.getPageSize() > 5000){
            page.setSize(5000);
            page.setCurrent(1);
        }else{
            page.setSize(mgtMemberBrowsePageDto.getPageSize());
            page.setCurrent(mgtMemberBrowsePageDto.getPageNum());
        }
        List<MgtMemberBrowsePageVo> mgtMemberBrowsePageVoList = browseRecordService.pageMgtMemberBrowse(page,mgtMemberBrowsePageDto);
        ExcelUtil<MgtMemberBrowsePageVo> util = new ExcelUtil<MgtMemberBrowsePageVo>(MgtMemberBrowsePageVo.class);
        util.exportExcel(response, mgtMemberBrowsePageVoList, "用户浏览记录");
    }

    @RequestMapping(value = "/editMemberArchiveFields", method = RequestMethod.POST)
    @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "编辑会员档案")
    @ApiOperation(value = "编辑会员档案")
    public R editMemberArchiveFields(@RequestBody MgtArchiveFieldsEditDto mgtArchiveFieldsEditDto) {
        Long userId = SecurityUtils.getUserId();
        mgtArchiveFieldsEditDto.setUserId(userId);
        memberArchiveFieldsService.editMemberArchiveFields(mgtArchiveFieldsEditDto);
        return R.ok();
    }

    @RequestMapping(value = "/deleteMemberArchiveFields", method = RequestMethod.POST)
    @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "删除会员档案")
    @ApiOperation(value = "删除会员档案")
    public R deleteMemberArchiveFields(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
        Long userId = SecurityUtils.getUserId();
        mgtBaseGetDto.setUserId(userId);
        memberArchiveFieldsService.deleteMemberArchiveFields(mgtBaseGetDto);
        return R.ok();
    }


    @RequestMapping(value = "/pageMgtMemberSuggest", method = RequestMethod.POST)
    @ApiOperation(value = "平台获取用户建议列表")
    public R<Page<MgtMemberSuggestPageVo>> pageMgtMemberSuggest(@RequestBody MgtMemberSuggestPageDto memberSuggestPageDto) {
        Long userId = SecurityUtils.getUserId();
        memberSuggestPageDto.setUserId(userId);
        Page<MgtMemberSuggestPageVo> page = new Page<>();
        page.setSize(memberSuggestPageDto.getPageSize());
        page.setCurrent(memberSuggestPageDto.getPageNum());
        List<MgtMemberSuggestPageVo> mgtMemberSuggestPageVoList = memberSuggestService.pageMgtMemberSuggest(page,memberSuggestPageDto);
        return R.ok(page.setRecords(mgtMemberSuggestPageVoList));
    }

    @RequestMapping(value = "/exportPageMgtMemberSuggest", method = RequestMethod.POST)
    @ApiOperation(value = "导出用户建议列表")
    public void exportPageMgtMemberSuggest( MgtMemberSuggestPageDto memberSuggestPageDto, HttpServletResponse response) {
        Long userId = SecurityUtils.getUserId();
        memberSuggestPageDto.setUserId(userId);
        Page<MgtMemberSuggestPageVo> page = new Page<>();
        if(memberSuggestPageDto.getPageSize() > 5000){
            page.setSize(5000);
            page.setCurrent(1);
        }else{
            page.setSize(memberSuggestPageDto.getPageSize());
            page.setCurrent(memberSuggestPageDto.getPageNum());
        }
        List<MgtMemberSuggestPageVo> mgtMemberSuggestPageVoList = memberSuggestService.pageMgtMemberSuggest(page,memberSuggestPageDto);
        ExcelUtil<MgtMemberSuggestPageVo> util = new ExcelUtil<MgtMemberSuggestPageVo>(MgtMemberSuggestPageVo.class);
        util.exportExcel(response, mgtMemberSuggestPageVoList, "用户建议列表");
    }

    @RequestMapping(value = "/mgtReplayMemberSuggest", method = RequestMethod.POST)
    @Log(title = "会员建议管理", businessType = BusinessType.UPDATE,operContent = "回复会员建议")
    @ApiOperation(value = "平台回复会员建议")
    public R mgtReplayMemberSuggest(@RequestBody MgtReplayMemberSuggestDto mgtReplayMemberSuggestDto) {
        Long userId = SecurityUtils.getUserId();
        mgtReplayMemberSuggestDto.setUserId(userId);
        memberSuggestService.mgtReplayMemberSuggest(mgtReplayMemberSuggestDto);
        return R.ok();
    }


    @RequestMapping(value = "/listMgtMemberSuggestTag", method = RequestMethod.POST)
    @ApiOperation(value = "获取会员建议标签")
    public R<List<MgtMemberSuggestTagVo>> listMgtMemberSuggestTag(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
        List<MgtMemberSuggestTagVo> mgtMemberSuggestTagVoList = memberSuggestService.listMgtMemberSuggestTag(Long.valueOf(mgtBaseGetDto.getId()));
        return R.ok(mgtMemberSuggestTagVoList);
    }

    @RequestMapping(value = "/mgtEditMemberSuggestTag", method = RequestMethod.POST)
    @Log(title = "会员建议管理", businessType = BusinessType.UPDATE,operContent = "编辑会员建议标签")
    @ApiOperation(value = "平台编辑会员建议标签")
    public R mgtEditMemberSuggestTag(@RequestBody MgtTagMemberSuggestDto mgtTagMemberSuggestDto) {
        Long userId = SecurityUtils.getUserId();
        mgtTagMemberSuggestDto.setUserId(userId);
        memberSuggestService.mgtEditMemberSuggestTag(mgtTagMemberSuggestDto);
        return R.ok();
    }

    @RequestMapping(value = "/mgtFrozenMember", method = RequestMethod.POST)
    @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "冻结会员")
    @ApiOperation(value = "冻结会员")
    public R mgtReplayMemberSuggest(@RequestBody MgtFrozenMemberDto mgtFrozenMemberDto) {
        Long userId = SecurityUtils.getUserId();
        mgtFrozenMemberDto.setUserId(userId);
        memberService.mgtFrozenMember(mgtFrozenMemberDto);
        return R.ok();
    }
}