From 43c263df4d8ce0cc830f287780c29db8a2b47f0f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 27 五月 2024 08:44:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 8443dc8..4219436 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -1,15 +1,22 @@
package com.ruoyi.order.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.order.domain.pojo.Order;
+import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.order.service.IOrderService;
+import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.dto.OrderDTO;
-import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
/**
* <p>
@@ -19,17 +26,56 @@
* @author mitao
* @since 2024-05-16
*/
+@Slf4j
@RestController
@RequestMapping("/order")
+@RequiredArgsConstructor
public class OrderController {
- @ApiModelProperty
- private IOrderService iOrderService;
+
+ private final IOrderService orderService;
@PostMapping("/saveOrderOne")
@ResponseBody
+ @InnerAuth
public R<T> saveOrderOne(@RequestBody OrderDTO OrderDTO) {
- iOrderService.saveOrderOne(OrderDTO);
-
+ orderService.saveOrderOne(OrderDTO);
return R.ok();
}
+
+
+ /**
+ * 获取某个商品的已购会员数
+ *
+ * @param id 秒杀商品id
+ * @return 已购会员数
+ */
+ @InnerAuth
+ @GetMapping("/seckill-members/{id}")
+ R<Integer> getSeckillMembers(@PathVariable("id") Long id) {
+ return R.ok(orderService.getSeckillMembers(id));
+ }
+
+ /**
+ * 获取团购商品已购数量
+ *
+ * @param id 团购商品id
+ * @return 团购商品已购数量
+ */
+ @InnerAuth
+ @GetMapping("/group-purchase-num/{id}")
+ R<Integer> getGroupPurchasesGoodsNum(@PathVariable("id") Long id) {
+ return R.ok(orderService.getGroupPurchasesGoodsNum(id));
+ }
+
+ /**
+ * 获取团购商品已购订单列表
+ *
+ * @param id 团购商品id
+ * @return List<Order> 订单列表
+ */
+ @InnerAuth
+ @GetMapping("/group-purchase-id/{id}")
+ R<List<Order>> getOrderByGroupPurchaseId(@PathVariable("id") Long id) {
+ return R.ok(orderService.getOrderByGroupPurchaseId(id));
+ }
}
--
Gitblit v1.7.1