From b72094a519b590ccebb805b5ca6906e380dcb566 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 26 九月 2024 16:01:46 +0800
Subject: [PATCH] 9.24
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 97901b7..1eb1e82 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
@@ -12,6 +12,7 @@
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.AppGoodQuery;
+import com.ruoyi.common.core.dto.ExchangeBackDto;
import com.ruoyi.common.core.dto.PointChangeDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
@@ -184,8 +185,7 @@
return R.ok();
}
- @ApiOperation(tags = {"小程序-" +
- "兑换商城"},value = "积分兑换商品")
+ @ApiOperation(tags = {"小程序-兑换商城"},value = "积分兑换商品")
@PostMapping(value = "/app/shop")
public AjaxResult<PageInfo<TGoods>> shop(@RequestBody ExchangeDto exchangeDto) {
//检查当前用户积分是否够
@@ -201,6 +201,9 @@
Long count = orderClient.getExchangeById(exchangeDto.getGoodId(), userId,exchangeDto.getGoodType()).getData();
if (good.getLimitExchangeTimes() != -1 && count >= good.getLimitExchangeTimes()) {
return AjaxResult.error("当前用户已兑换"+count+"张");
+ }else {
+ //减少库存
+ good.setInventory(good.getInventory()-exchangeDto.getNum());
}
if (user.getPoints()<good.getRedeemPoints()){
return AjaxResult.error("当前用户积分不足");
@@ -210,17 +213,21 @@
point = coupon.getRedeemPoints();
Long count = orderClient.getExchangeById(exchangeDto.getGoodId(), userId,exchangeDto.getGoodType()).getData();
- if (coupon.getInventoryQuantity() != -1 && count >= coupon.getInventoryQuantity()) {
- return AjaxResult.error("当前用户已到达兑换"+coupon+"次");
- }
if (user.getPoints()<point){
return AjaxResult.error("当前用户积分不足");
}
+ if (coupon.getInventoryQuantity() != -1 && count >= coupon.getInventoryQuantity()) {
+ return AjaxResult.error("当前用户已到达兑换"+coupon+"次");
+ }else {
+ coupon.setInventoryQuantity(coupon.getInventoryQuantity()-exchangeDto.getNum());
+ }
+
+
}
exchangeDto.setPoint(point);
exchangeDto.setUserId(userId);
//生成积分兑换成功的订单
- R<Long> longR = orderClient.exchangeCreate(exchangeDto);
+ R<ExchangeBackDto> longR = orderClient.exchangeCreate(exchangeDto);
if (exchangeDto.getGoodType()==2) {
TCoupon coupon = couponService.getById(exchangeDto.getGoodId());
@@ -247,6 +254,7 @@
pointChangeDto.setPoints(point);
pointChangeDto.setRemark(longR.getData().toString());
pointChangeDto.setType(6);
+ pointChangeDto.setCode(longR.getData().getCode());
appUserClient.changeDown(pointChangeDto);
return AjaxResult.success();
--
Gitblit v1.7.1