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-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsGroupPurchaseController.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsGroupPurchaseController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsGroupPurchaseController.java
index dea8bed..3f9be24 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsGroupPurchaseController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsGroupPurchaseController.java
@@ -3,9 +3,9 @@
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.goods.controller.management.DTO.GoodsGroupPurchaseDTO;
-import com.ruoyi.goods.controller.management.DTO.GoodsGroupPurchaseQuery;
-import com.ruoyi.goods.controller.management.VO.GoodsGroupPurchaseVO;
+import com.ruoyi.goods.controller.management.dto.GoodsGroupPurchaseDTO;
+import com.ruoyi.goods.controller.management.dto.GoodsGroupPurchaseQuery;
+import com.ruoyi.goods.controller.management.vo.GoodsGroupPurchaseVO;
 import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
 import com.ruoyi.system.api.domain.dto.ListStatusDTO;
 import io.swagger.annotations.Api;
@@ -86,4 +86,16 @@
         goodsGroupPurchaseService.updStatus(dto);
         return R.ok();
     }
+
+    /**
+     * 立即结束
+     *
+     * @param id 团购商品id
+     */
+    @ApiOperation(value = "立即结束", notes = "立即结束")
+    @PutMapping("/stop-immediately/{id}")
+    public R<Void> stopImmediately(@PathVariable("id") Long id) {
+        goodsGroupPurchaseService.stopImmediately(id);
+        return R.ok();
+    }
 }

--
Gitblit v1.7.1