From 0b9e60f0bada4cc39187a9dd3c36bf37452f63de Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 七月 2025 18:58:10 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java | 33 +++++++++++++++++++++------------
1 files changed, 21 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 8ed681c..7bdb2fa 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,10 +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.GetLotteryEventList;
import com.ruoyi.goods.api.domain.TLotteryEvent;
import com.ruoyi.goods.api.service.LotteryEventClient;
import com.ruoyi.member.domain.dto.AppMemberCouponPageDto;
@@ -110,14 +112,19 @@
vo.setId(coupon.getCouponId());
vo.setName(coupon.getCouponName());
vo.setType(coupon.getCouponType());
+ vo.setSendType(coupon.getSendType());
vo.setMoneyThreshold(coupon.getMoneyThreshold());
vo.setDiscountPercent(coupon.getDiscountPercent());
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.setSharePassage(coupon.getSharePassage());
+ vo.setSharePic(coupon.getSharePic());
vo.setUseGoods("");
//构建特定商品数据
if (StringUtils.isNotEmpty(coupon.getRelGoodsIds())) {
@@ -129,18 +136,17 @@
}
vo.setUseGoods(sb.substring(0, sb.length() - 1));
}
- vo.setLaveNum(coupon.getSendLimitFlag());
- vo.setReceiveNum(coupon.getSendLimitNumber());
+ vo.setLimitFlag(coupon.getSendLimitFlag());
+ vo.setReceiveNum(coupon.getLimitNumber());
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());
- }
+ vo.setLaveNum(coupon.getLimitNumber() - count);
+ 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);
}
-
-
+
+
@ResponseBody
@PostMapping("/shareCoupon/{couponId}")
@ApiOperation(value = "分享优惠券【2.0】", tags = "领券中心")
@@ -149,7 +155,10 @@
})
public R<String> shareCoupon(@PathVariable("couponId") String couponId) {
//检测是否可以抽奖
- List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(3).getData();
+ GetLotteryEventList getLotteryEventList = new GetLotteryEventList();
+ getLotteryEventList.setActivityType(3);
+ getLotteryEventList.setUserId(SecurityUtils.getUserId());
+ List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(getLotteryEventList).getData();
if (data.size() > 0) {
return R.ok(data.get(0).getId());
}
--
Gitblit v1.7.1