From a015e7c916474bb51b33c228f690aa17f30c746c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 09:32:31 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
index 50a1633..8176748 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
@@ -14,7 +14,9 @@
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.account.api.vo.PaymentUserCoupon;
import com.ruoyi.other.api.domain.Goods;
+import com.ruoyi.other.api.domain.PointSetting;
import com.ruoyi.other.api.feignClient.GoodsClient;
+import com.ruoyi.other.api.feignClient.PointSettingClient;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -54,12 +56,15 @@
private UserPointService userPointService;
@Resource
private GoodsClient goodsClient;
+
+ @Resource
+ private PointSettingClient pointSettingClient;
@GetMapping("/mine/list")
- @ApiOperation(value = "已领取列表", tags = {"小程序-个人中心-优惠劵","后台管理-活动管理-优惠券管理"})
+ @ApiOperation(value = "已领取列表", tags = {"小程序-个人中心-优惠劵"})
public R<Page<UserCoupon>> minelist(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @ApiParam("1未使用2已使用3已过期") Integer status) {
Long userid = tokenService.getLoginUserApplet().getUserid();
Page<UserCoupon> page = userCouponService.lambdaQuery()
@@ -116,7 +121,8 @@
Long userid = tokenService.getLoginUserApplet().getUserid();
AppUser byId = appUserService.getById(userid);
- CouponInfo data = couponClient.detail(couponId).getData();
+ R<CouponInfo> detail = couponClient.detail(couponId);
+ CouponInfo data = detail.getData();
//检验当前优惠券是否存在
if (data==null){
return R.fail("当前优惠券不存在，请刷新后重试");
@@ -131,23 +137,27 @@
}
//如果是积分兑换，增加积分的历史记录
if (data.getSendType()!=1){
+ int point = data.getNeedPoint().intValue();
+ Integer lavePoint = byId.getLavePoint();
+ //扣除积分
+ byId.setLavePoint(byId.getLavePoint() - point);
+ appUserService.updateById(byId);
+
UserPoint userPoint = new UserPoint();
userPoint.setType(4);
- userPoint.setHistoricalPoint(byId.getLavePoint());
- userPoint.setVariablePoint(data.getNeedPoint().intValue());
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(point);
+ userPoint.setBalance(byId.getLavePoint());
userPoint.setAppUserId(userid);
userPoint.setObjectId(Long.valueOf(data.getId()));
userPointService.save(userPoint);
- //扣除积分
- byId.setLavePoint(byId.getLavePoint() - userPoint.getVariablePoint());
- appUserService.updateById(byId);
}
//增加优惠券记录,根据时间类型设置开始结束时间
UserCoupon userCoupon = new UserCoupon();
userCoupon.setAppUserId(userid);
if (data.getPeriodType()==1) {
- userCoupon.setStartTime(data.getPeriodStartTime().atTime(0,0,0));
- userCoupon.setEndTime(data.getPeriodEndTime().atTime(0,0,0));
+ userCoupon.setStartTime(data.getPeriodStartTime().atTime(0, 0, 0));
+ userCoupon.setEndTime(data.getPeriodEndTime().atTime(23, 59, 59));
}else {
userCoupon.setStartTime(now);
userCoupon.setEndTime(now.plusDays(data.getPeriodDays()));
--
Gitblit v1.7.1