From 3d1c46677a3fb95a4d776735925047c08dee17a3 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 07 六月 2024 18:17:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/MgtPromotionWishListController.java |   71 +++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/MgtPromotionWishListController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/MgtPromotionWishListController.java
index 879f7bc..d284227 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/MgtPromotionWishListController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/MgtPromotionWishListController.java
@@ -3,14 +3,19 @@
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.promotion.domain.PromotionWishList;
+import com.ruoyi.promotion.controller.management.dto.MgtPromotionWishListDTO;
+import com.ruoyi.promotion.controller.management.dto.MgtPromotionWishListQuery;
+import com.ruoyi.promotion.controller.management.vo.MgtPromotionWishListVO;
 import com.ruoyi.promotion.service.IPromotionWishListService;
-import com.ruoyi.system.api.domain.dto.PromotionWishListDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import javax.annotation.Resource;
-import org.apache.poi.ss.formula.functions.T;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+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.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -25,37 +30,47 @@
  */
 @RestController
 @RequestMapping("/mgt/promotion-wish-list")
-@Api(value = "用户端-心愿单相关接口", tags = "用户端-心愿单相关接口", description = "用户端-心愿单相关接口")
+@RequiredArgsConstructor
+@Api(value = "管理后台-心愿求购管理相关接口", tags = "管理后台-心愿求购管理相关接口")
 public class MgtPromotionWishListController {
 
-    @Resource
-    private IPromotionWishListService iPromotionWishListService;
+    private final IPromotionWishListService promotionWishListService;
 
-    @PostMapping("/getPromotionWishList")
-    @ApiOperation(value = "用户端-获取心愿单列表")
-    public R<PageDTO<PromotionWishList>> getPromotionWishList(
-            @RequestBody PromotionWishListDTO promotionWishListDTO) {
-        return R.ok(iPromotionWishListService.getPromotionWishList(promotionWishListDTO));
+    /**
+     * 获取心愿求购列表的分页数据
+     *
+     * @param query 心愿求购管理查询对象
+     * @return PageDTO<MgtPromotionWishListVO>
+     */
+    @ApiOperation("获取心愿求购列表的分页数据")
+    @PostMapping("page")
+    public R<PageDTO<MgtPromotionWishListVO>> getPromotionWishListPage(
+            @Validated @RequestBody MgtPromotionWishListQuery query) {
+        return R.ok(promotionWishListService.getPromotionWishListPage(query));
     }
 
-    @PostMapping("/savePromotionWishList")
-    @ApiOperation(value = "用户端-添加心愿单列表")
-    public R<T> savePromotionWishList(@RequestBody PromotionWishListDTO promotionWishListDTO) {
-        iPromotionWishListService.savePromotionWishList(promotionWishListDTO);
-        return R.ok();
+    /**
+     * 查看详情
+     *
+     * @param id 心愿求购id
+     * @return MgtPromotionWishListVO
+     */
+    @ApiOperation("查看详情")
+    @GetMapping("/detail/{id}")
+    public R<MgtPromotionWishListVO> getPromotionWishDetail(
+            @ApiParam(value = "心愿求购id", required = true) @PathVariable("id") Long id) {
+        return R.ok(promotionWishListService.getPromotionWishDetail(id));
     }
 
-    @PostMapping("/getPromotionWishOne")
-    @ApiOperation(value = "用户端-获取心愿单个")
-    public R<PromotionWishList> getPromotionWishOne(
-            @RequestBody PromotionWishListDTO promotionWishListDTO) {
-        return R.ok(iPromotionWishListService.getPromotionWishOne(promotionWishListDTO));
-    }
-
-    @PostMapping("/delPromotionWishOne")
-    @ApiOperation(value = "用户端-删除心愿单个")
-    public R<T> delPromotionWishOne(@RequestBody PromotionWishListDTO promotionWishListDTO) {
-        iPromotionWishListService.delPromotionWishOne(promotionWishListDTO);
+    /**
+     * 回复
+     *
+     * @param dto 心愿求购数据传输对象
+     */
+    @ApiOperation("回复")
+    @PutMapping("/reply")
+    public R<?> reply(@Validated @RequestBody MgtPromotionWishListDTO dto) {
+        promotionWishListService.reply(dto);
         return R.ok();
     }
 }

--
Gitblit v1.7.1