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-goods/src/main/java/com/ruoyi/goods/controller/GoodsGroupPurchaseController.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsGroupPurchaseController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsGroupPurchaseController.java
index d263ca4..f619db5 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsGroupPurchaseController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsGroupPurchaseController.java
@@ -1,8 +1,14 @@
package com.ruoyi.goods.controller;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
-
import org.springframework.web.bind.annotation.RestController;
/**
@@ -13,8 +19,35 @@
* @author mitao
* @since 2024-05-16
*/
+@Slf4j
@RestController
+@RequiredArgsConstructor
@RequestMapping("/goods-group-purchase")
public class GoodsGroupPurchaseController {
+ private final IGoodsGroupPurchaseService goodsGroupPurchaseService;
+
+ /**
+ * 团购商品开始团购
+ *
+ * @param groupPurchaseId 团购商品id
+ */
+ @InnerAuth
+ @GetMapping("/start/{groupPurchaseId}")
+ R<?> startGroupPurchase(@PathVariable("groupPurchaseId") Long groupPurchaseId) {
+ goodsGroupPurchaseService.startGroupPurchase(groupPurchaseId);
+ return R.ok();
+ }
+
+ /**
+ * 团购商品结束团购
+ *
+ * @param groupPurchaseId 团购商品id
+ */
+ @InnerAuth
+ @GetMapping("/end/{groupPurchaseId}")
+ R<?> endGroupPurchase(@PathVariable("groupPurchaseId") Long groupPurchaseId) {
+ goodsGroupPurchaseService.endGroupPurchase(groupPurchaseId);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1