From 546be8a1bafdfc804575a8d07a5d9f2306c29c42 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 六月 2025 11:20:58 +0800
Subject: [PATCH] 修改直播列表
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
index 92cc2d3..d895e44 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
@@ -875,6 +875,26 @@
}
}
}
+ String useLimit = "";
+ for(MgtCouponAuditPageVo mgtCouponAuditPageVo : mgtCouponAuditPageVoList){
+ useLimit = null;
+ //处理使用限制
+ String couponType = mgtCouponAuditPageVo.getCouponType();
+ if(couponType.equals("满减")){
+ BigDecimal moneyThreshold = mgtCouponAuditPageVo.getMoneyThreshold();
+ BigDecimal discountMoney = mgtCouponAuditPageVo.getDiscountMoney();
+ useLimit = "满" + moneyThreshold.toString() + "减" + discountMoney.toString() + "元";
+ }
+ if(couponType.equals("折扣")){
+ BigDecimal discountPercent = mgtCouponAuditPageVo.getDiscountPercent();
+ useLimit = discountPercent.toString() + "折";
+ }
+ if(couponType.equals("代金")){
+ BigDecimal discountMoney = mgtCouponAuditPageVo.getDiscountMoney();
+ useLimit = discountMoney.toString();
+ }
+ mgtCouponAuditPageVo.setUseLimit(useLimit);
+ }
return mgtCouponAuditPageVoList;
}
@@ -1234,7 +1254,6 @@
Coupon coupon;
List<MemberCoupon> memberCouponList = new ArrayList<>();
MemberCoupon memberCoupon;
- String memberCouponId;
// 遍历生日礼物发送DTO列表
for(BirthdayGiftSendDto birthdayGiftSendDto : giftSendDtoList){
@@ -1248,9 +1267,6 @@
// 根据优惠券数量生成会员优惠券列表
for(int i=0;i<birthdayGiftSendDto.getCouponNumber();i++){
memberCoupon = new MemberCoupon();
- //TODO
- memberCouponId = IdUtils.simpleUUID();
- //memberCoupon.setId(memberCouponId);
memberCoupon.setDelFlag(0);
memberCoupon.setCouponId(couponId);
memberCoupon.setUserId(userId);
@@ -1421,8 +1437,6 @@
}
//生成用户优惠券
MemberCoupon memberCoupon = new MemberCoupon();
- //String memberCouponId = IdUtils.simpleUUID();
- //memberCoupon.setId(memberCouponId);
memberCoupon.setDelFlag(0);
memberCoupon.setCouponId(couponId);
memberCoupon.setUserId(userId);
--
Gitblit v1.7.1