From 99dac23df67b49972724dfe53c7902da9f47e052 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 29 Jan 2024 23:45:54 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 1e4ab20..059ea38 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -725,7 +725,7 @@
}
List<MallVipConfig> configs = mallVipConfigMapper.selectVipConfigList();
- if (CollUtil.isNotEmpty(configs)) {
+ if (StrUtil.isBlank(mallMember.getLevel()) && CollUtil.isNotEmpty(configs)) {
MallVipConfig mallVipConfig = configs.get(0);
mallMember.setLevel(mallVipConfig.getCode());
}
@@ -1119,6 +1119,7 @@
LambdaQueryWrapper<MallMemberCoupon> memberCouponQuery = new LambdaQueryWrapper<>();
memberCouponQuery.in(MallMemberCoupon::getCouponId, couponIds)
.eq(MallMemberCoupon::getMemberId, member.getId())
+ .eq(MallMemberCoupon::getFromType, 3)
.ge(MallMemberCoupon::getCreatedTime, DateUtil.beginOfDay(new Date()))
.le(MallMemberCoupon::getCreatedTime, DateUtil.endOfDay(new Date()));
List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectList(memberCouponQuery);
@@ -1140,6 +1141,7 @@
memberCoupon.setInviteId(member.getInviteId());
memberCoupon.setCouponUuid(IdUtil.simpleUUID());
memberCoupon.setState(1);
+ memberCoupon.setFromType(3);
memberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(), item.getExpireDay()));
memberCoupon.setMemberId(member.getId());
mallMemberCouponMapper.insert(memberCoupon);
--
Gitblit v1.9.1