From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsGroupPurchaseController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsGroupPurchaseController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsGroupPurchaseController.java
index 9051af8..8133873 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsGroupPurchaseController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsGroupPurchaseController.java
@@ -1,13 +1,13 @@
package com.ruoyi.goods.controller.forepart;
-import com.fasterxml.jackson.core.JsonProcessingException;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.goods.controller.forepart.vo.GoodsGroupPurchaseInfoVO;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.system.api.domain.vo.GoodsGroupPurchaseInfoVO;
import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
-import com.ruoyi.system.api.domain.vo.HomeGoodsSkuInfoVO;
+import com.ruoyi.system.api.domain.vo.WdGoodsGroupPurchaseVO;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -25,14 +25,27 @@
@RestController
@RequiredArgsConstructor
@RequestMapping("/forepart/goods-group-purchase")
+@Api(value = "用戶端-商品团购接口", tags = "用戶端-商品团购接口", description = "用戶端-商品团购接口")
public class ForepartGoodsGroupPurchaseController {
private final IGoodsGroupPurchaseService goodsGroupPurchaseService;
- @RequestMapping("/getGoodsGroupPurchaseInfo")
- @ResponseBody
+ @PostMapping("/getGoodsGroupPurchaseInfo")
@ApiOperation(value = "用户端-团购商品详情")
public R<GoodsGroupPurchaseInfoVO> getGoodsGroupPurchaseInfo(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO) {
return R.ok(goodsGroupPurchaseService.getGoodsGroupPurchaseInfo(homeGoodsSkuDTO));
}
+
+ @PostMapping("/QxGoodsGroupPurchase")
+ @ApiOperation(value = "用户端-取消团购商品")
+ public R QxGoodsGroupPurchase(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO) {
+ goodsGroupPurchaseService.QxGoodsGroupPurchase(homeGoodsSkuDTO);
+ return R.ok();
+ }
+
+ @PostMapping("/CtjlGoodsGroupPurchase")
+ @ApiOperation(value = "用户端-我的参团记录")
+ public R<PageDTO<WdGoodsGroupPurchaseVO>> CtjlGoodsGroupPurchase(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO) {
+ return R.ok(goodsGroupPurchaseService.CtjlGoodsGroupPurchase(homeGoodsSkuDTO));
+ }
}
--
Gitblit v1.7.1