From 3252f21707899e504d27bcf72939a4e08b866918 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Jan 2024 14:56:46 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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 fa63266..1279ee7 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
@@ -1087,14 +1087,13 @@
MallMember member = this.baseMapper.selectById(loginUser.getId());
+ MallMember mallMember = new MallMember();
+ mallMember.setId(member.getId());
+ mallMember.setLastLoginTime(new Date());
+ this.baseMapper.updateById(mallMember);
+
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.UNALIVE_COUPON.getType(), DataDictionaryEnum.UNALIVE_COUPON.getCode());
if (dic == null || StrUtil.isBlank(dic.getValue())) {
-
- MallMember mallMember = new MallMember();
- mallMember.setId(member.getId());
- mallMember.setLastLoginTime(new Date());
- this.baseMapper.updateById(mallMember);
-
return new HashMap<>();
}
@@ -1110,6 +1109,9 @@
List<Long> couponIds = list.stream().filter(item -> {
return item.getDay() <= days && item.getCouponId() != null;
}).map(VipSettingUnAliveSettingBo::getCouponId).collect(Collectors.toList());
+ if (CollUtil.isEmpty(couponIds)) {
+ return new HashMap<>();
+ }
LambdaQueryWrapper<MallGoodsCoupon> query = new LambdaQueryWrapper<>();
query.in(MallGoodsCoupon::getId, couponIds)
@@ -1127,11 +1129,6 @@
memberCoupon.setMemberId(member.getId());
mallMemberCouponMapper.insert(memberCoupon);
});
-
- MallMember mallMember = new MallMember();
- mallMember.setId(member.getId());
- mallMember.setLastLoginTime(new Date());
- this.baseMapper.updateById(mallMember);
Map<String, Object> result = new HashMap<>();
result.put("coupon", coupons);
--
Gitblit v1.9.1