From ddee28676ae16b682651eea38f0c1071cf1565b8 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期三, 22 五月 2024 15:33:43 +0800
Subject: [PATCH] feat: 接口返回VO类;接口调试修改BUG
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
index 7ee95af..b5320aa 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
@@ -11,6 +11,7 @@
import com.ruoyi.goods.dto.GoodQueryDTO;
import com.ruoyi.goods.dto.GoodsTypeQuery;
import com.ruoyi.goods.service.*;
+import com.ruoyi.goods.vo.GoodDetailVO;
import com.ruoyi.goods.vo.TGoodsVO;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,9 +23,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -176,6 +175,9 @@
*/
@GetMapping("/confirm")
@ApiOperation(value = "确认收货", tags = {"兑换记录"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
+ })
public AjaxResult confirm(@RequestParam Integer id) {
TOrder byId = orderService.getById(id);
byId.setState(3);
@@ -241,12 +243,10 @@
/**
* 可兑换商品推荐
+ * 远程调用
*/
@GetMapping("/goodRecommend")
@ApiOperation(value = "可兑换商品推荐", tags = {"可兑换商品推荐"})
- @ApiImplicitParams({
- @ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
- })
public R<List<TGoodsVO>> goodRecommend() {
return R.ok(goodsService.goodRecommend(tokenService.getLoginUserStudy().getUserid()));
}
@@ -261,21 +261,14 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
})
- public AjaxResult<Map<String, Object>> goodDetail(@RequestParam String goodId) {
- Map<String, Object> result = new HashMap<>(8);
+ public AjaxResult<GoodDetailVO> goodDetail(@RequestParam String goodId) {
// 商品详情
TGoods goods = goodsService.lambdaQuery().eq(TGoods::getId, goodId).one();
- result.put("goodDetail", goods);
// 商品分类详情
- result.put("goodTypeDetail", goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.asList(goods.getTypeIds().split(","))).list());
+ List<TGoodsType> goodsTypes = goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.asList(goods.getTypeIds().split(","))).list();
// 已兑换人数
- result.put("number", goods.getBasicCount() + orderService.getGoodBuyNumber(goods.getId()));
- // 用户收货地址
- if (tokenService.getLoginUserStudy().getUserid() != null) {
- result.put("address", recipientService.lambdaQuery()
- .eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid()).eq(Recipient::getIsDefault, 1).one());
- }
- return AjaxResult.success(result);
+ int number = goods.getBasicCount() + orderService.getGoodBuyNumber(goods.getId());
+ return AjaxResult.success(new GoodDetailVO(goods, goodsTypes, number));
}
/**
@@ -286,9 +279,10 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
})
- public AjaxResult<Map<String, Object>> redeemNow(@RequestParam String goodId) {
+ public AjaxResult<GoodDetailVO> redeemNow(@RequestParam String goodId) {
Recipient recipient = recipientService.lambdaQuery()
- .eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid()).eq(Recipient::getIsDefault, 1).one();
+ .eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid())
+ .eq(Recipient::getIsDefault, 1).one();
return AjaxResult.success(goodsService.redeemNow(goodId, recipient));
}
--
Gitblit v1.7.1