From 0c5a2097a86a82c60c40da98a0fdaf386ab5d0e6 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期三, 19 六月 2024 15:17:27 +0800
Subject: [PATCH] fix: 商品兑换bug
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 87d6a62..48c5d95 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
@@ -164,6 +164,11 @@
@PostMapping("/addGoods")
@ApiOperation(value = "添加", tags = {"后台-商品管理"})
public R addGoods(@RequestBody TGoods dto) {
+ if (dto.getTotal()!=null){
+ dto.setSurplus(dto.getTotal());
+ }else{
+ dto.setSurplus(0);
+ }
goodsService.save(dto);
return R.ok("添加成功");
}
@@ -179,6 +184,11 @@
@PostMapping("/updateGoods")
@ApiOperation(value = "修改", tags = {"后台-商品管理"})
public R updateGoods(@RequestBody TGoods dto) {
+ if (dto.getTotal()!=null){
+ dto.setSurplus(dto.getTotal());
+ }else{
+ dto.setSurplus(0);
+ }
goodsService.updateById(dto);
return R.ok("修改成功");
}
@@ -592,7 +602,11 @@
@ApiOperation(value = "可兑换商品推荐", tags = {"学习端-商城"})
@ApiOperationSupport(order = 38)
public R<List<TGoodsVO>> goodRecommend() {
- return R.ok(goodsService.goodRecommend(tokenService.getLoginUserStudy().getUserid()));
+ LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
+ if (null == loginUserStudy) {
+ return R.tokenError("登录失效！");
+ }
+ return R.ok(goodsService.goodRecommend(loginUserStudy.getUserid()));
}
/**
@@ -754,6 +768,7 @@
@PostMapping("/goodExchange")
@ApiOperation(value = "家长端-商品兑换确认", tags = {"家长端-商品兑换确认"})
public R goodExchange(@RequestBody GoodExchangeDTO goodExchange) {
+ System.err.println("家长兑换:");
Recipient recipient = recipientService.getById(Integer.valueOf(goodExchange.getRecipientId()));
return goodsService.goodExchange1(goodExchange, recipient);
}
@@ -762,6 +777,7 @@
@ApiOperation(value = "商品兑换确认", tags = {"学习端-商城"})
@ApiOperationSupport(order = 42)
public R<String> goodExchangeStudy(@RequestBody @Validated GoodExchangeDTO goodExchange) {
+ System.err.println("学习兑换:");
Recipient recipient = recipientService.getById(goodExchange.getRecipientId());
return goodsService.goodExchange(goodExchange, recipient);
}
--
Gitblit v1.7.1