From b22df417e0bc423c788b013feaad686531d69eed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 08 一月 2025 09:51:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 0ddb1ef..a08b7cf 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
@@ -1,6 +1,7 @@
package com.ruoyi.account.controller;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.AppUser;
@@ -12,6 +13,7 @@
import com.ruoyi.account.service.UserCouponService;
import com.ruoyi.account.service.UserPointService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.account.api.vo.PaymentUserCoupon;
import com.ruoyi.other.api.domain.Goods;
@@ -75,6 +77,7 @@
.lt(status!=null&&status==3,UserCoupon::getEndTime, LocalDateTime.now())
.eq(UserCoupon::getAppUserId, userid).page(Page.of(pageNum-1, pageSize));
for (UserCoupon record : page.getRecords()) {
+ record.setIdStr(record.getId().toString());
CouponInfo data = couponClient.detail(record.getCouponId()).getData();
CouponInfoVo vo = new CouponInfoVo();
BeanUtils.copyProperties(data,vo);
@@ -152,6 +155,7 @@
userPoint.setBalance(byId.getLavePoint());
userPoint.setAppUserId(userid);
userPoint.setObjectId(Long.valueOf(data.getId()));
+ userPoint.setCreateTime(LocalDateTime.now());
userPointService.save(userPoint);
}
//增加优惠券记录,根据时间类型设置开始结束时间
@@ -218,16 +222,31 @@
public R<UserCoupon> getCouponInfoInfo(String id){
UserCoupon userCoupon = userCouponService.getById(id);
CouponInfo couponInfo = couponClient.detail(userCoupon.getCouponId()).getData();
- List<Goods> goods = null;
- if("-1".equals(couponInfo.getForGoodIds())){
- goods = goodsClient.getGoodsByType(2).getData();
+ List<String> goodNames = new ArrayList<>();
+ if(!"null".equals(couponInfo.getGoodsNameJson()) && StringUtils.isNotEmpty(couponInfo.getGoodsNameJson())){
+ goodNames = JSON.parseArray(couponInfo.getGoodsNameJson(), String.class);
}else{
- goods = goodsClient.getGoodsById(couponInfo.getForGoodIds().split(",")).getData();
+ List<Goods> goods = null;
+ if("-1".equals(couponInfo.getForGoodIds())){
+ goods = goodsClient.getGoodsByType(2).getData();
+ }else{
+ goods = goodsClient.getGoodsById(couponInfo.getForGoodIds().split(",")).getData();
+ }
+ goodNames = goods.stream().map(Goods::getName).collect(Collectors.toList());
}
+
CouponInfoVo couponInfoVo = new CouponInfoVo();
BeanUtils.copyProperties(couponInfo, couponInfoVo);
- couponInfoVo.setGoodNames(goods.stream().map(Goods::getName).collect(Collectors.toList()));
+ couponInfoVo.setGoodNames(goodNames);
userCoupon.setCouponInfoVo(couponInfoVo);
+ if (userCoupon.getUseTime()==null){
+ userCoupon.setStatus(1);
+ if (userCoupon.getEndTime().isBefore(LocalDateTime.now())){
+ userCoupon.setStatus(3);
+ }
+ }else {
+ userCoupon.setStatus(2);
+ }
return R.ok(userCoupon);
}
@@ -239,10 +258,10 @@
if(null == userCoupon){
return R.ok("核销码错误");
}
- if(userCoupon.getStatus() == 2){
+ if(userCoupon.getUseTime() != null){
return R.ok("优惠券已使用");
}
- if(userCoupon.getStatus() == 3){
+ if(LocalDateTime.now().isAfter(userCoupon.getEndTime())){
return R.ok("优惠券已过期");
}
userCoupon.setStatus(2);
--
Gitblit v1.7.1