From 21573e8e02dc47202ca3e1f7d4705795a09c1b60 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 09:11:36 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..a84eb54 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());
@@ -134,9 +134,11 @@
}
vo.setLaveNum(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