From 2de3851b223854c5bc6120df91f5f3dd29c177e3 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 29 七月 2025 18:12:33 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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 270e667..c8cd1eb 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,11 +1,12 @@
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;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.goods.api.domain.LotteryEvent;
+import com.ruoyi.goods.api.domain.TLotteryEvent;
import com.ruoyi.goods.api.service.LotteryEventClient;
import com.ruoyi.member.domain.dto.AppMemberCouponPageDto;
import com.ruoyi.member.domain.pojo.coupon.Coupon;
@@ -115,8 +116,10 @@
vo.setDiscountMoney(coupon.getDiscountMoney());
vo.setValidType(coupon.getValidTimeType());
vo.setValidDays(coupon.getValidDay());
- vo.setValidStartTime(sdf.format(coupon.getValidStartTime()));
- vo.setValidEndTime(sdf.format(coupon.getValidEndTime()));
+ if (2 != coupon.getValidTimeType()) {
+ vo.setValidStartTime(sdf.format(coupon.getValidStartTime()));
+ vo.setValidEndTime(sdf.format(coupon.getValidEndTime()));
+ }
vo.setPropagandaPoster(coupon.getPropagandaPoster());
vo.setUseGoods("");
//构建特定商品数据
@@ -129,14 +132,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", couponId).eq("del_flag", 0));
vo.setLaveNum(coupon.getSendLimitNumber() - count);
- MemberCoupon one = memberCouponService.getOne(new QueryWrapper<MemberCoupon>().eq("coupon_id", couponId).eq("user_id", SecurityUtils.getUserId()));
- if (one != null) {
- vo.setStatus(one.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);
}
@@ -147,12 +149,12 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "优惠券id", required = true, dataType = "String", paramType = "path")
})
- public R<Boolean> shareCoupon(@PathVariable("couponId") String couponId) {
+ public R<String> shareCoupon(@PathVariable("couponId") String couponId) {
//检测是否可以抽奖
- List<LotteryEvent> data = lotteryEventClient.getLotteryEventList(3).getData();
+ List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(3).getData();
if (data.size() > 0) {
- return R.ok(true);
+ return R.ok(data.get(0).getId());
}
- return R.ok(false);
+ return R.ok();
}
}
--
Gitblit v1.7.1