From 14e5f337c527d07d8b0e67a4fd0673e6a560db0d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 七月 2025 10:11:28 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
index e6cc3d0..306a64a 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
@@ -1,5 +1,6 @@
package com.ruoyi.member.controller.miniapp;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
@@ -104,9 +105,8 @@
@ApiImplicitParam(name = "id", value = "优惠券id", required = true, dataType = "String", paramType = "path")
})
public R<CouponInfoVo> getCouponInfo(@PathVariable("couponId") String couponId) {
- MemberCoupon memberCoupon = memberCouponService.getById(couponId);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- Coupon coupon = couponService.getById(memberCoupon.getCouponId());
+ Coupon coupon = couponService.getById(couponId);
CouponInfoVo vo = new CouponInfoVo();
vo.setId(coupon.getCouponId());
vo.setName(coupon.getCouponName());
@@ -121,6 +121,8 @@
vo.setValidEndTime(sdf.format(coupon.getValidEndTime()));
}
vo.setPropagandaPoster(coupon.getPropagandaPoster());
+ vo.setSharePassage(coupon.getSharePassage());
+ vo.setSharePic(coupon.getSharePic());
vo.setUseGoods("");
//构建特定商品数据
if (StringUtils.isNotEmpty(coupon.getRelGoodsIds())) {
@@ -132,11 +134,13 @@
}
vo.setUseGoods(sb.substring(0, sb.length() - 1));
}
- vo.setLaveNum(coupon.getSendLimitFlag());
+ vo.setLimitFlag(coupon.getSendLimitFlag());
vo.setReceiveNum(coupon.getSendLimitNumber());
- int count = memberCouponService.count(new QueryWrapper<MemberCoupon>().eq("coupon_id", memberCoupon.getCouponId()).eq("del_flag", 0));
+ int count = memberCouponService.count(new QueryWrapper<MemberCoupon>().eq("coupon_id", couponId).eq("del_flag", 0));
vo.setLaveNum(coupon.getSendLimitNumber() - count);
- vo.setStatus(memberCoupon.getCouponStatus());
+ Long userId = SecurityUtils.getUserId();
+ List<MemberCoupon> list = memberCouponService.list(new QueryWrapper<MemberCoupon>().eq("coupon_id", couponId).eq("user_id", userId).eq("del_flag", 0));
+ vo.setStatus(list.isEmpty() ? null : list.get(0).getCouponStatus());
return R.ok(vo);
}
--
Gitblit v1.7.1