bug修改

huliguo

1 天以前 d617e84caebaf2e7aa09c55cb2bd89c5a23ef8ac

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

@@ -3,11 +3,10 @@
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.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.dto.*;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
@@ -20,6 +19,7 @@

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

@@ -65,9 +65,12 @@
        Long userId = SecurityUtils.getUserId();
        mgtMemberOrderPageDto.setUserId(userId);
        Page<MgtMemberOrderPageVo> page = new Page<>();
        if(page.getSize()>5000){
        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()){
@@ -114,13 +117,11 @@
        Long userId = SecurityUtils.getUserId();
        mgtShopOrderPageDto.setUserId(userId);
        Page<MgtActivityOrderPageVo> page = new Page<>();
        if(page.getSize()>5000){
            page.setSize(5000);
            page.setCurrent(1);
        }
        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)
@@ -141,13 +142,11 @@
        Long userId = SecurityUtils.getUserId();
        mgtShopOrderPageDto.setUserId(userId);
        Page<MgtShopOrderPageVo> page = new Page<>();
        if(page.getSize()>5000){
            page.setSize(5000);
            page.setCurrent(1);
        }
        page.setSize(Integer.MAX_VALUE);
        page.setCurrent(1);
        List<MgtShopOrderPageVo> shopOrderPageVoList = orderService.pageMgtShopOrder(page,mgtShopOrderPageDto);
        ExcelUtil<MgtShopOrderPageVo> util = new ExcelUtil<MgtShopOrderPageVo>(MgtShopOrderPageVo.class);
        util.exportExcel(response, shopOrderPageVoList, "门店订单列表");
        util.exportExcel(response, shopOrderPageVoList, "门店订单列表", "门店订单列表");
    }

    @RequestMapping(value = "/getMgtOrderDetail", method = RequestMethod.POST)
@@ -192,4 +191,21 @@
        ExcelUtil<MgtShopAllOrderPageVo> util = new ExcelUtil<MgtShopAllOrderPageVo>(MgtShopAllOrderPageVo.class);
        util.exportExcel(response, shopAllOrderPageVoList, "商户订单记录");
    }

    //取消
    @RequestMapping(value = "/cancelOrderBySys", method = RequestMethod.POST)
    @Log(title = "订单管理", businessType = BusinessType.UPDATE,operContent = "取消订单")
    @ApiOperation(value = "取消订单【2.0】")
    public R cancelOrderBySys(@RequestBody CancelOrderDTO dto) {
        return orderService.cancelOrderBySys(dto);
    }
    //退款
    @RequestMapping(value = "/refundOrderBySys", method = RequestMethod.POST)
    @Log(title = "订单管理", businessType = BusinessType.UPDATE,operContent = "退款")
    @ApiOperation(value = "退款【2.0】")
    public R refundOrderBySys(@RequestBody CancelOrderDTO dto) {
        return orderService.refundOrderBySys(dto);
    }
    //todo 分页获取三方订单
    //todo 导出三方订单
}