From 4de99ed19360471d9c9cc192d85f10185db4259f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 25 五月 2024 09:39:30 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 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 bb4d88b..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,11 +4,18 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.order.service.IOrderService;
-import lombok.AllArgsConstructor;
+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;
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;
/**
@@ -22,10 +29,19 @@
@Slf4j
@RestController
@RequestMapping("/order")
-@AllArgsConstructor
+@RequiredArgsConstructor
public class OrderController {
private final IOrderService orderService;
+ @PostMapping("/saveOrderOne")
+ @ResponseBody
+ @InnerAuth
+ public R<T> saveOrderOne(@RequestBody OrderDTO OrderDTO) {
+ orderService.saveOrderOne(OrderDTO);
+ return R.ok();
+
+ }
+
/**
* 获取某个商品的已购会员数
@@ -38,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