From d617e84caebaf2e7aa09c55cb2bd89c5a23ef8ac Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期六, 28 六月 2025 15:58:33 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
index 1508dbf..aa4c921 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
+++ b/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;
@@ -117,16 +117,11 @@
Long userId = SecurityUtils.getUserId();
mgtShopOrderPageDto.setUserId(userId);
Page<MgtActivityOrderPageVo> page = new Page<>();
- if(mgtShopOrderPageDto.getPageSize() > 5000){
- page.setSize(5000);
- page.setCurrent(1);
- }else{
- page.setSize(mgtShopOrderPageDto.getPageSize());
- page.setCurrent(mgtShopOrderPageDto.getPageNum());
- }
+ 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)
@@ -147,16 +142,11 @@
Long userId = SecurityUtils.getUserId();
mgtShopOrderPageDto.setUserId(userId);
Page<MgtShopOrderPageVo> page = new Page<>();
- if(mgtShopOrderPageDto.getPageSize() > 5000){
- page.setSize(5000);
- page.setCurrent(1);
- }else{
- page.setSize(mgtShopOrderPageDto.getPageSize());
- page.setCurrent(mgtShopOrderPageDto.getPageNum());
- }
+ 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)
@@ -201,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 导出三方订单
}
--
Gitblit v1.7.1