From 274673c7c81c639c1edb038281445f076c824dc1 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期二, 18 三月 2025 09:08:17 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 2323b6d..623e0be 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
@@ -75,7 +75,8 @@
public R<Page<UserCoupon>> minelist(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @ApiParam("1未使用2已使用3已过期") Integer status) {
Long userid = tokenService.getLoginUserApplet().getUserid();
LambdaQueryChainWrapper<UserCoupon> chainWrapper = userCouponService.lambdaQuery()
- .eq(UserCoupon::getAppUserId, userid);
+ .eq(UserCoupon::getAppUserId, userid)
+ .isNotNull(UserCoupon::getCouponInfo);
if(null != status && 1 == status){
chainWrapper.isNull(UserCoupon::getUseTime).gt(UserCoupon::getEndTime, LocalDateTime.now());
}
@@ -92,7 +93,7 @@
CouponInfoVo vo = JSON.parseObject(couponInfo, CouponInfoVo.class);
// BeanUtils.copyProperties(data,vo);
//如果是商品券，将商品名称返回
- if (vo.getCouponType()==4){
+ if (vo != null && vo.getCouponType()==4){
List<String> goodNames = new ArrayList<>();
if (vo.getForGoodIds().equals("-1")){
List<Goods> data1 = goodsClient.getAllGoods().getData();
@@ -299,9 +300,8 @@
@PostMapping("/getCouponInfo")
public R<CouponInfoVo> getCouponInfo(@RequestParam("userCouponId") Long userCouponId){
UserCoupon userCoupon = userCouponService.getById(userCouponId);
- CouponInfo data = couponClient.detail(userCoupon.getCouponId()).getData();
- CouponInfoVo couponInfoVo = new CouponInfoVo();
- BeanUtils.copyProperties(data, couponInfoVo);
+ String jsonStr = userCoupon.getCouponInfo();
+ CouponInfoVo couponInfoVo = JSON.parseObject(jsonStr, CouponInfoVo.class);
return R.ok(couponInfoVo);
}
--
Gitblit v1.7.1