Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-05-10 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java

@@ -1,12 +1,14 @@
package com.ruoyi.shop.controller.business;

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.shop.domain.vo.MgtShopInfoVo;
import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +16,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * @author jqs34
@@ -31,6 +35,18 @@
    @Autowired
    private ShopService shopService;

    @Autowired
    private ShopCertificateService shopCertificateService;

    @Autowired
    private ShopStaffService shopStaffService;

    @Autowired
    private RecommendCooperationService recommendCooperationService;

    @Autowired
    private ShopSuggestService shopSuggestService;

    /**
     * 未完成实际统计
     * @param merBaseDto
@@ -44,6 +60,97 @@
        return R.ok(merHomeShopTotalVo);
    }

    @RequestMapping(value = "/pageMerAgency", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取商户加盟商列表")
    public R<Page<MerAgencyPageVo>> pageMerAgency(@RequestBody MerAgencyPageDto merAgencyPageDto) {
        Long userId = SecurityUtils.getUserId();
        merAgencyPageDto.setUserId(userId);
        Page<MerAgencyPageVo> page = new Page<>();
        page.setSize(merAgencyPageDto.getPageSize());
        page.setCurrent(merAgencyPageDto.getPageNum());
        List<MerAgencyPageVo> merAgencyPageVoList = shopService.pageMerAgencyVo(page,merAgencyPageDto);
        return R.ok(page.setRecords(merAgencyPageVoList));
    }

    @RequestMapping(value = "/listShopCertificate", method = RequestMethod.POST)
    @ApiOperation(value = "获取商户证书列表")
    public R<List<MerShopCertificateListVo>> listShopCertificate(@RequestBody MerShopCertificateListDto merShopCertificateListDto) {
        Long userId = SecurityUtils.getUserId();
        List<MerShopCertificateListVo> merShopCertificateListVoList = shopCertificateService.listShopCertificateVo(merShopCertificateListDto);
        return R.ok(merShopCertificateListVoList);
    }

    @RequestMapping(value = "/editShopCertificate", method = RequestMethod.POST)
    @ApiOperation(value = "编辑商户证书")
    public R editShopCertificate(@RequestBody MerShopCertificateEditDto merShopCertificateEditDto) {
        Long userId = SecurityUtils.getUserId();
        shopCertificateService.editShopCertificate(merShopCertificateEditDto);
        return R.ok();
    }

    @RequestMapping(value = "/deleteShopCertificate", method = RequestMethod.POST)
    @ApiOperation(value = "删除商户证书")
    public R deleteShopCertificate(@RequestBody MerBaseGetDto merBaseGetDto) {
        Long userId = SecurityUtils.getUserId();
        shopCertificateService.deleteShopCertificate(Long.valueOf(merBaseGetDto.getId()));
        return R.ok();
    }

    @RequestMapping(value = "/getShopStaffInfo", method = RequestMethod.POST)
    @ApiOperation(value = "获取员工信息")
    public R<MerStaffInfoVo> getShopStaffInfo() {
        Long userId = SecurityUtils.getUserId();
        MerStaffInfoVo merStaffInfoVo = shopStaffService.getShopStaffInfo(userId);
        return R.ok(merStaffInfoVo);
    }

    @RequestMapping(value = "/editShopStaffInfo", method = RequestMethod.POST)
    @ApiOperation(value = "修改员工信息")
    public R editShopStaffInfo(@RequestBody MerEditUserDto merEditUserDto) {
        Long userId = SecurityUtils.getUserId();
        shopStaffService.editShopStaffInfo(merEditUserDto);
        return R.ok();
    }

    @RequestMapping(value = "/pageMerShopRecommend", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取商户推荐列表")
    public R<Page<MerShopRecommendPageVo>> pageMerShopRecommend(@RequestBody MerShopRecommendPageDto merShopRecommendPageDto) {
        Long userId = SecurityUtils.getUserId();
        merShopRecommendPageDto.setUserId(userId);
        Page<MerShopRecommendPageVo> page = new Page<>();
        page.setSize(merShopRecommendPageDto.getPageSize());
        page.setCurrent(merShopRecommendPageDto.getPageNum());
        List<MerShopRecommendPageVo> merShopRecommendPageVoList = recommendCooperationService.pageMerShopRecommend(page,merShopRecommendPageDto);
        return R.ok(page.setRecords(merShopRecommendPageVoList));
    }

    @RequestMapping(value = "/recommendCooperation", method = RequestMethod.POST)
    @ApiOperation(value = "推荐合作")
    public R recommendCooperation(@RequestBody MerRecommendCooperationDto merRecommendCooperationDto) {
        Long userId = SecurityUtils.getUserId();
        merRecommendCooperationDto.setUserId(userId);
        recommendCooperationService.recommendCooperation(merRecommendCooperationDto);
        return R.ok();
    }

    @RequestMapping(value = "/pageMerShopSuggest", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取商户建议")
    public R<Page<MerShopSuggestVo>> pageMerShopSuggest(@RequestBody MerPageDto merPageDto) {
        Long userId = SecurityUtils.getUserId();
        merPageDto.setUserId(userId);
        Page<MerShopSuggestVo> page = new Page<>();
        page.setSize(merPageDto.getPageSize());
        page.setCurrent(merPageDto.getPageNum());
        List<MerShopSuggestVo> merShopSuggestVoList = shopSuggestService.pageMerShopSuggest(page,merPageDto);
        return R.ok(page.setRecords(merShopSuggestVoList));
    }

    @RequestMapping(value = "/suggest", method = RequestMethod.POST)
    @ApiOperation(value = "建议")
    public R suggest(@RequestBody MerShopSuggestDto merShopSuggestDto) {
        Long userId = SecurityUtils.getUserId();
        merShopSuggestDto.setUserId(userId);
        shopSuggestService.suggest(merShopSuggestDto);
        return R.ok();
    }
}