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 | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 6ec68f8..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
@@ -4,7 +4,9 @@
import com.ruoyi.common.core.domain.R;
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 java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
@@ -33,9 +35,9 @@
private final IOrderService orderService;
@PostMapping("/saveOrderOne")
@ResponseBody
+ @InnerAuth
public R<T> saveOrderOne(@RequestBody OrderDTO OrderDTO) {
orderService.saveOrderOne(OrderDTO);
-
return R.ok();
}
@@ -52,4 +54,28 @@
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