bug修改

mitao

2025-01-17 afa0dbb4f54e7244835dd67ec33c3e545f122f71

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java

@@ -6,6 +6,7 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.MgtMemberOrderPageDto;
import com.ruoyi.order.domain.dto.MgtMemberOrderTotalDto;
import com.ruoyi.order.domain.dto.MgtShopAllOrderPageDto;
import com.ruoyi.order.domain.dto.MgtShopOrderPageDto;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
@@ -19,6 +20,7 @@

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.math.BigInteger;
import java.util.List;
import java.util.stream.Collectors;

@@ -59,13 +61,18 @@
    }

    @RequestMapping(value = "/exportPageMgtMemberOrder", method = RequestMethod.POST)
    @ApiOperation(value = "平台获取用户订单列表")
    public void exportPageMgtMemberOrder(@RequestBody MgtMemberOrderPageDto mgtMemberOrderPageDto, HttpServletResponse response) {
    @ApiOperation(value = "导出获取用户订单列表")
    public void exportPageMgtMemberOrder(MgtMemberOrderPageDto mgtMemberOrderPageDto, HttpServletResponse response) {
        Long userId = SecurityUtils.getUserId();
        mgtMemberOrderPageDto.setUserId(userId);
        Page<MgtMemberOrderPageVo> page = new Page<>();
        page.setSize(2000);
        page.setCurrent(1);
        if(mgtMemberOrderPageDto.getPageSize() > 5000){
            page.setSize(5000);
            page.setCurrent(1);
        }else{
            page.setSize(mgtMemberOrderPageDto.getPageSize());
            page.setCurrent(mgtMemberOrderPageDto.getPageNum());
        }
        List<MgtMemberOrderPageVo> mgtMemberOrderPageVoList = orderService.pageMgtMemberOrder(page,mgtMemberOrderPageDto);
        if(!mgtMemberOrderPageVoList.isEmpty()){
            List<MgtOrderGoodsPageVo> mgtOrderGoodsVoList;
@@ -91,6 +98,8 @@
        return R.ok(mgtOrderTotal);
    }



    @RequestMapping(value = "/pageMgtActivityOrder", method = RequestMethod.POST)
    @ApiOperation(value = "平台获取秒杀订单列表")
    public R<Page<MgtActivityOrderPageVo>> pageMgtActivityOrder(@RequestBody MgtShopOrderPageDto mgtShopOrderPageDto) {
@@ -105,15 +114,15 @@

    @RequestMapping(value = "/exportPageMgtActivityOrder", method = RequestMethod.POST)
    @ApiOperation(value = "导出秒杀订单列表")
    public void exportPageMgtActivityOrder(@RequestBody MgtShopOrderPageDto mgtShopOrderPageDto, HttpServletResponse response) {
    public void exportPageMgtActivityOrder( MgtShopOrderPageDto mgtShopOrderPageDto, HttpServletResponse response) {
        Long userId = SecurityUtils.getUserId();
        mgtShopOrderPageDto.setUserId(userId);
        Page<MgtActivityOrderPageVo> page = new Page<>();
        page.setSize(2000);
        page.setSize(Integer.MAX_VALUE);
        page.setCurrent(1);
        List<MgtActivityOrderPageVo> mgtActivityOrderPageVos = orderService.pageMgtActivityOrder(page,mgtShopOrderPageDto);
        ExcelUtil<MgtActivityOrderPageVo> util = new ExcelUtil<MgtActivityOrderPageVo>(MgtActivityOrderPageVo.class);
        util.exportExcel(response, mgtActivityOrderPageVos, "秒杀订单列表");
        util.exportExcel(response, mgtActivityOrderPageVos, "秒杀订单列表", "秒杀订单列表");
    }

    @RequestMapping(value = "/pageMgtShopOrder", method = RequestMethod.POST)
@@ -130,26 +139,15 @@

    @RequestMapping(value = "/exportPageMgtShopOrder", method = RequestMethod.POST)
    @ApiOperation(value = "导出门店订单列表")
    public void exportPageMgtShopOrder(@RequestBody MgtShopOrderPageDto mgtShopOrderPageDto, HttpServletResponse response) {
    public void exportPageMgtShopOrder( MgtShopOrderPageDto mgtShopOrderPageDto, HttpServletResponse response) {
        Long userId = SecurityUtils.getUserId();
        mgtShopOrderPageDto.setUserId(userId);
        Page<MgtShopOrderPageVo> page = new Page<>();
        page.setSize(2000);
        page.setSize(Integer.MAX_VALUE);
        page.setCurrent(1);
        List<MgtShopOrderPageVo> shopOrderPageVoList = orderService.pageMgtShopOrder(page,mgtShopOrderPageDto);
        if(!shopOrderPageVoList.isEmpty()){
            List<MgtOrderGoodsPageVo> mgtOrderGoodsVoList;
            String goodsString;
            for(MgtShopOrderPageVo entity : shopOrderPageVoList){
                mgtOrderGoodsVoList = entity.getMgtOrderGoodsPageVoList();
                goodsString = mgtOrderGoodsVoList.stream()
                        .map(goods -> goods.getGoodsName() + "*" + goods.getBuyNum())
                        .collect(Collectors.joining(";"));
                entity.setGoodsInfo(goodsString);
            }
        }
        ExcelUtil<MgtShopOrderPageVo> util = new ExcelUtil<MgtShopOrderPageVo>(MgtShopOrderPageVo.class);
        util.exportExcel(response, shopOrderPageVoList, "门店订单列表");
        util.exportExcel(response, shopOrderPageVoList, "门店订单列表", "门店订单列表");
    }

    @RequestMapping(value = "/getMgtOrderDetail", method = RequestMethod.POST)
@@ -161,4 +159,37 @@
        return R.ok(mgtOrderDetail);
    }

    @RequestMapping(value = "/getMgtShopAllOrderTotal", method = RequestMethod.POST)
    @ApiOperation(value = "获取商户订单统计")
    public R<MgtShopAllOrderTotal> getMgtShopAllOrderTotal(@RequestBody MgtShopAllOrderPageDto mgtShopAllOrderPageDto) {
        Long userId = SecurityUtils.getUserId();
        mgtShopAllOrderPageDto.setUserId(userId);
        MgtShopAllOrderTotal shopAllOrderTotal = orderService.getMgtShopAllOrderTotal(mgtShopAllOrderPageDto);
        return R.ok(shopAllOrderTotal);
    }

    @RequestMapping(value = "/pageMgtShopAllOrder", method = RequestMethod.POST)
    @ApiOperation(value = "平台获取商户订单记录")
    public R<Page<MgtShopAllOrderPageVo>> pageMgtShopAllOrder(@RequestBody MgtShopAllOrderPageDto mgtShopAllOrderPageDto) {
        Long userId = SecurityUtils.getUserId();
        mgtShopAllOrderPageDto.setUserId(userId);
        Page<MgtShopAllOrderPageVo> page = new Page<>();
        page.setSize(mgtShopAllOrderPageDto.getPageSize());
        page.setCurrent(mgtShopAllOrderPageDto.getPageNum());
        List<MgtShopAllOrderPageVo> shopAllOrderPageVoList = orderService.pageMgtShopAllOrder(page,mgtShopAllOrderPageDto);
        return R.ok(page.setRecords(shopAllOrderPageVoList));
    }

    @RequestMapping(value = "/exportPageMgtShopAllOrder", method = RequestMethod.POST)
    @ApiOperation(value = "导出平台获取商户订单记录")
    public void pageMgtShopAllOrder(MgtShopAllOrderPageDto mgtShopAllOrderPageDto, HttpServletResponse response) {
        Long userId = SecurityUtils.getUserId();
        mgtShopAllOrderPageDto.setUserId(userId);
        Page<MgtShopAllOrderPageVo> page = new Page<>();
        page.setSize(mgtShopAllOrderPageDto.getPageSize());
        page.setCurrent(mgtShopAllOrderPageDto.getPageNum());
        List<MgtShopAllOrderPageVo> shopAllOrderPageVoList = orderService.pageMgtShopAllOrder(page,mgtShopAllOrderPageDto);
        ExcelUtil<MgtShopAllOrderPageVo> util = new ExcelUtil<MgtShopAllOrderPageVo>(MgtShopAllOrderPageVo.class);
        util.exportExcel(response, shopAllOrderPageVoList, "商户订单记录");
    }
}