From f4e649d4d9a5c682f58aa13d40b368a6097975a2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 九月 2024 11:07:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 6c6629d..cddf7b0 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
@@ -16,6 +16,8 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.order.api.model.TShoppingOrder;
@@ -84,6 +86,7 @@
@PostMapping("/saveGoods")
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品添加")
+ @Log(title = "【商品管理】添加商品", businessType = BusinessType.INSERT)
public AjaxResult saveActivity(@RequestBody TGoods dto) {
goodsService.save(dto);
return AjaxResult.success();
@@ -93,6 +96,7 @@
@GetMapping("/delete")
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品删除")
+ @Log(title = "【商品管理】删除商品", businessType = BusinessType.DELETE)
public AjaxResult delete(String ids) {
goodsService.removeBatchByIds(Arrays.asList(ids.split(",")));
return AjaxResult.success();
@@ -102,6 +106,7 @@
@PostMapping("/updateVip")
@ApiOperation(tags = {"管理后台-商品管理"},value = "商品修改")
+ @Log(title = "【商品管理】修改商品", businessType = BusinessType.UPDATE)
public AjaxResult updateActivity(@RequestBody TGoods dto) {
goodsService.updateById(dto);
return AjaxResult.success();
@@ -185,6 +190,7 @@
//检查当前用户积分是否够
Long userId = tokenService.getLoginUserApplet().getUserId();
Integer point = 0;
+ TAppUser user = appUserClient.getUserById(userId).getData();
if (exchangeDto.getGoodType()==1) {
//查询当前商品信息
@@ -195,7 +201,6 @@
if (good.getLimitExchangeTimes() != -1 && count >= good.getLimitExchangeTimes()) {
return AjaxResult.error("当前用户已兑换"+count+"张");
}
- TAppUser user = appUserClient.getUserById(userId).getData();
if (user.getPoints()<good.getRedeemPoints()){
return AjaxResult.error("当前用户积分不足");
}
@@ -207,18 +212,32 @@
if (coupon.getInventoryQuantity() != -1 && count >= coupon.getInventoryQuantity()) {
return AjaxResult.error("当前用户已到达兑换"+coupon+"次");
}
+ if (user.getPoints()<point){
+ return AjaxResult.error("当前用户积分不足");
+ }
}
exchangeDto.setPoint(point);
exchangeDto.setUserId(userId);
//生成积分兑换成功的订单
R<Long> longR = orderClient.exchangeCreate(exchangeDto);
if (exchangeDto.getGoodType()==2) {
+ TCoupon coupon = couponService.getById(exchangeDto.getGoodId());
+
//如果是优惠卷，赠送优惠卷给用户
GrantCouponDto grantCouponDto = new GrantCouponDto();
grantCouponDto.setUserIds(userId.toString());
grantCouponDto.setCouponId(exchangeDto.getGoodId());
grantCouponDto.setWaysToObtain(1);
grantCouponDto.setEndTime(LocalDateTime.now());
+ grantCouponDto.setType(3);
+ switch (coupon.getValidityPeriodMode()){
+ case 1:
+ grantCouponDto.setEndTime(coupon.getEndTime());
+ break;
+ case 2:
+ grantCouponDto.setEndTime(LocalDateTime.now().plusDays(coupon.getDays()));
+ break;
+ }
appCouponClient.grantCoupon(grantCouponDto);
}
//生成消耗积分的记录
--
Gitblit v1.7.1