From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 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 b06d4ff..5f0f69c 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,25 +3,21 @@
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.order.domain.dto.MerOrderPageDto;
import com.ruoyi.order.domain.dto.MgtMemberOrderPageDto;
import com.ruoyi.order.domain.dto.MgtMemberOrderTotalDto;
-import com.ruoyi.order.domain.vo.MerOrderPageVo;
-import com.ruoyi.order.domain.vo.MgtMemberOrderPageVo;
-import com.ruoyi.order.domain.vo.MgtMemberOrderTotalVo;
+import com.ruoyi.order.domain.dto.MgtShopOrderPageDto;
+import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
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 java.util.List;
-
-import static org.reflections.Reflections.log;
/**
* @author jqs34
@@ -35,7 +31,7 @@
@RequestMapping("/mgt/order")
public class MgtOrderController {
- @Autowired
+ @Resource
private OrderService orderService;
@RequestMapping(value = "/getMgtMemberOrderTotal", method = RequestMethod.POST)
@@ -59,4 +55,47 @@
return R.ok(page.setRecords(mgtMemberOrderPageVoList));
}
+ @RequestMapping(value = "/getMgtOrderTotal", method = RequestMethod.POST)
+ @ApiOperation(value = "获取订单统计")
+ public R<MgtOrderTotal> getMgtOrderTotal(@RequestBody MgtShopOrderPageDto mgtShopOrderPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtShopOrderPageDto.setUserId(userId);
+ MgtOrderTotal mgtOrderTotal = orderService.getMgtOrderTotal(mgtShopOrderPageDto);
+ return R.ok(mgtOrderTotal);
+ }
+
+ @RequestMapping(value = "/pageMgtActivityOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "平台获取秒杀订单列表")
+ public R<Page<MgtActivityOrderPageVo>> pageMgtActivityOrder(@RequestBody MgtShopOrderPageDto mgtShopOrderPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtShopOrderPageDto.setUserId(userId);
+ Page<MgtActivityOrderPageVo> page = new Page<>();
+ page.setSize(mgtShopOrderPageDto.getPageSize());
+ page.setCurrent(mgtShopOrderPageDto.getPageNum());
+ List<MgtActivityOrderPageVo> mgtActivityOrderPageVos = orderService.pageMgtActivityOrder(page,mgtShopOrderPageDto);
+ return R.ok(page.setRecords(mgtActivityOrderPageVos));
+ }
+
+ @RequestMapping(value = "/pageMgtShopOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "平台获取门店订单列表")
+ public R<Page<MgtShopOrderPageVo>> pageMgtShopOrder(@RequestBody MgtShopOrderPageDto mgtShopOrderPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtShopOrderPageDto.setUserId(userId);
+ Page<MgtShopOrderPageVo> page = new Page<>();
+ page.setSize(mgtShopOrderPageDto.getPageSize());
+ page.setCurrent(mgtShopOrderPageDto.getPageNum());
+ List<MgtShopOrderPageVo> shopOrderPageVoList = orderService.pageMgtShopOrder(page,mgtShopOrderPageDto);
+ return R.ok(page.setRecords(shopOrderPageVoList));
+ }
+
+
+ @RequestMapping(value = "/getMgtOrderDetail", method = RequestMethod.POST)
+ @ApiOperation(value = "获取订单详情")
+ public R<MgtOrderDetailVo> getMgtOrderDetail(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtBaseGetDto.setUserId(userId);
+ MgtOrderDetailVo mgtOrderDetail = orderService.getMgtOrderDetail(mgtBaseGetDto.getId());
+ return R.ok(mgtOrderDetail);
+ }
+
}
--
Gitblit v1.7.1