From 57145eb45c9b339eecc97a5037c60c2f8da8f8fd Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 五月 2024 20:56:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 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 20988ac..fe88a1b 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
@@ -3,17 +3,17 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.*;
import com.ruoyi.goods.dto.GoodExchangeDTO;
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 com.ruoyi.system.api.model.LoginUserParent;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,9 +22,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -47,6 +45,8 @@
private IRecipientService recipientService;
@Resource
private IRegionService regionService;
+ @Resource
+ private TokenService tokenService;
@PostMapping("/listType")
@ApiOperation(value = "列表查询", tags = {"后台-商品类型管理"})
@@ -165,18 +165,22 @@
@GetMapping("/exchangeRecord")
@ApiOperation(value = "兑换记录", tags = {"兑换记录"})
public R<List<TOrder>> exchangeRecord() {
- return R.ok(orderService.lambdaQuery().eq(TOrder::getUserId, SecurityUtils.getUserId())
+ return R.ok(orderService.lambdaQuery().eq(TOrder::getUserId, tokenService.getLoginUserStudy().getUserid())
.orderByDesc(TOrder::getCreateTime).list());
}
+
/**
* 兑换记录
*/
@GetMapping("/confirm")
@ApiOperation(value = "确认收货", tags = {"兑换记录"})
- public AjaxResult confirm(@RequestParam Integer id) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
+ })
+ public R<Boolean> confirm(@RequestParam Integer id) {
TOrder byId = orderService.getById(id);
byId.setState(3);
- return AjaxResult.success(orderService.updateById(byId));
+ return R.ok(orderService.updateById(byId));
}
/**
@@ -186,7 +190,7 @@
@ApiOperation(value = "获取用户收货地址", tags = {"获取用户收货地址"})
public R<List<Recipient>> shopAddress() {
return R.ok(recipientService.lambdaQuery().eq(Recipient::getUserId,
- SecurityUtils.getUserId()).list());
+ tokenService.getLoginUserStudy().getUserid()).list());
}
/**
@@ -195,7 +199,7 @@
@PostMapping("/addressSaveOrUpdate")
@ApiOperation(value = "新增收货地址/修改收货地址", tags = {"新增收货地址/修改收货地址"})
public R<String> addressSave(@RequestBody Recipient recipient) {
- recipient.setUserId(SecurityUtils.getUserId().intValue());
+ recipient.setUserId(tokenService.getLoginUserStudy().getUserid());
return R.ok(recipientService.addressSaveOrUpdate(recipient));
}
@@ -204,6 +208,9 @@
*/
@GetMapping("/addressDelete")
@ApiOperation(value = "删除收货地址", tags = {"删除收货地址"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "地址信息id", name = "id", dataType = "String", required = true)
+ })
public R<String> addressDelete(@RequestParam String id) {
return R.ok(recipientService.removeById(id) ? "删除成功！" : "删除失败！");
}
@@ -215,7 +222,12 @@
*/
@GetMapping("/updateOrderAddress")
@ApiOperation(value = "修改订单收货地址", tags = {"修改订单收货地址"})
- public R<Boolean> updateOrderAddress(@RequestParam String orderId, @RequestParam String address) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
+ @ApiImplicitParam(value = "完整收货地址", name = "address", dataType = "String", required = true)
+ })
+ public R<Boolean> updateOrderAddress(@RequestParam String orderId,
+ @RequestParam String address) {
return R.ok(orderService.lambdaUpdate().set(TOrder::getConsigneeAddress, address)
.eq(TOrder::getId, orderId).eq(TOrder::getState, 1).update());
}
@@ -231,11 +243,12 @@
/**
* 可兑换商品推荐
+ * 远程调用
*/
@GetMapping("/goodRecommend")
@ApiOperation(value = "可兑换商品推荐", tags = {"可兑换商品推荐"})
- public R<List<TGoodsVO>> goodRecommend(String userId) {
- return R.ok(goodsService.goodRecommend(userId));
+ public R<List<TGoodsVO>> goodRecommend() {
+ return R.ok(goodsService.goodRecommend(tokenService.getLoginUserStudy().getUserid()));
}
/**
@@ -245,21 +258,17 @@
*/
@GetMapping("/goodDetail")
@ApiOperation(value = "商品详情", tags = {"商品详情"})
- public R<Map<String, Object>> goodDetail(@RequestParam String goodId) {
- Map<String, Object> result = new HashMap<>(8);
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
+ })
+ public R<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 (SecurityUtils.getUserId() != null) {
- result.put("address", recipientService.lambdaQuery()
- .eq(Recipient::getUserId, SecurityUtils.getUserId()).eq(Recipient::getIsDefault, 1).one());
- }
- return R.ok(result);
+ int number = goods.getBasicCount() + orderService.getGoodBuyNumber(goods.getId());
+ return R.ok(new GoodDetailVO(goods, goodsTypes, number));
}
/**
@@ -267,9 +276,13 @@
*/
@GetMapping("/redeemNow")
@ApiOperation(value = "商城-立即兑换", tags = {"立即兑换"})
- public R<Map<String, Object>> redeemNow(@RequestParam String goodId) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
+ })
+ public R<GoodDetailVO> redeemNow(@RequestParam String goodId) {
Recipient recipient = recipientService.lambdaQuery()
- .eq(Recipient::getUserId, SecurityUtils.getUserId()).eq(Recipient::getIsDefault, 1).one();
+ .eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid())
+ .eq(Recipient::getIsDefault, 1).one();
return R.ok(goodsService.redeemNow(goodId, recipient));
}
@@ -280,7 +293,7 @@
*/
@PostMapping("/goodExchange")
@ApiOperation(value = "商品兑换-确认", tags = {"商品兑换-确认"})
- public R<Object> goodExchange(@RequestBody GoodExchangeDTO goodExchange) {
+ public R<Boolean> goodExchange(@RequestBody GoodExchangeDTO goodExchange) {
Recipient recipient = recipientService.getById(goodExchange.getRecipientId());
return R.ok(goodsService.goodExchange(goodExchange, recipient));
}
--
Gitblit v1.7.1