From 89a4e2fcbc8884a98930cacacfac89811c287961 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 19:13:32 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
index 1eb1e82..8e5f18f 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
@@ -125,13 +125,19 @@
@GetMapping("/getInfoByType")
@ApiOperation(tags = {"小程序-兑换商城"},value = "商品查看详情")
- public AjaxResult getInfoByType(Integer goodType,Integer id) {
+ public R getInfoByType(Integer goodType,Integer id) {
if (goodType==1){
TGoods byId = goodsService.getById(id);
- return AjaxResult.ok(byId);}
+ if (byId==null||byId.getStatus()==2){
+ return R.fail(2,"该商品已不存在");
+ }
+ return R.ok(byId);}
else {
TCoupon byId = couponService.getById(id);
- return AjaxResult.ok(byId);
+ if (byId==null||byId.getStatus()==2){
+ return R.fail(2,"该商品已不存在");
+ }
+ return R.ok(byId);
}
}
@@ -203,7 +209,10 @@
return AjaxResult.error("当前用户已兑换"+count+"张");
}else {
//减少库存
- good.setInventory(good.getInventory()-exchangeDto.getNum());
+ if (good.getInventory()!=-1) {
+ good.setInventory(good.getInventory() - exchangeDto.getNum());
+ goodsService.updateById(good);
+ }
}
if (user.getPoints()<good.getRedeemPoints()){
return AjaxResult.error("当前用户积分不足");
@@ -219,7 +228,10 @@
if (coupon.getInventoryQuantity() != -1 && count >= coupon.getInventoryQuantity()) {
return AjaxResult.error("当前用户已到达兑换"+coupon+"次");
}else {
- coupon.setInventoryQuantity(coupon.getInventoryQuantity()-exchangeDto.getNum());
+ if (coupon.getInventoryQuantity()!=-1) {
+ coupon.setInventoryQuantity(coupon.getInventoryQuantity() - 1);
+ couponService.updateById(coupon);
+ }
}
@@ -252,11 +264,11 @@
PointChangeDto pointChangeDto = new PointChangeDto();
pointChangeDto.setUserId(userId);
pointChangeDto.setPoints(point);
- pointChangeDto.setRemark(longR.getData().toString());
+ pointChangeDto.setRemark(String.valueOf(longR.getData().getId()));
pointChangeDto.setType(6);
pointChangeDto.setCode(longR.getData().getCode());
appUserClient.changeDown(pointChangeDto);
- return AjaxResult.success();
+ return AjaxResult.success(longR.getData().getId());
}
@@ -277,6 +289,9 @@
BigDecimal vipDiscount = new BigDecimal(0);
if (exchangeDto.getGoodType()==1){
TGoods good = goodsService.getById(exchangeDto.getGoodId());
+ if (good.getStatus()==2){
+ return R.fail("当前商品已下架");
+ }
BigDecimal originalPrice = good.getPreferentialPrice();
exchangeDto.setTitle("【商品购买】"+good.getName());
if (isVip){
@@ -289,6 +304,9 @@
}else {
TCoupon coupon = couponService.getById(exchangeDto.getGoodId());
+ if (coupon.getStatus()==2){
+ return R.fail("当前商品已下架");
+ }
exchangeDto.setTitle("【优惠卷购买】"+coupon.getName());
BigDecimal originalPrice = coupon.getPaymentAmount();
if (isVip){
--
Gitblit v1.7.1