From 17cdd53716cf013794433bc5ccc6015f7bcf6a39 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 28 Jan 2024 21:47:19 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 11 +++++++----
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 1 -
3 files changed, 8 insertions(+), 6 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 8416aa4..15c18c1 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
@@ -1119,7 +1119,6 @@
LambdaQueryWrapper<MallMemberCoupon> memberCouponQuery = new LambdaQueryWrapper<>();
memberCouponQuery.in(MallMemberCoupon::getCouponId, couponIds)
.eq(MallMemberCoupon::getMemberId, member.getId())
- .eq(MallMemberCoupon::getState, 1)
.ge(MallMemberCoupon::getCreatedTime, DateUtil.beginOfDay(new Date()))
.le(MallMemberCoupon::getCreatedTime, DateUtil.endOfDay(new Date()));
List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectList(memberCouponQuery);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index ca2324c..978a305 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -150,7 +150,7 @@
orderItem.setState(1);
if (addOrderDto.getType() == 1) {
- mallShoppingCartMapper.delBySkuId(mallGoods.getId(), member.getId());
+ mallShoppingCartMapper.delBySkuId(item.getSkuId(), member.getId());
}
total = total.add(amount);
} else {
diff --git a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
index baf88ea..3f9ddf9 100644
--- a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
@@ -18,6 +18,7 @@
import cc.mrbird.febs.vip.service.IVipCommonService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -136,10 +137,12 @@
}
}
- MallMember update = new MallMember();
- update.setId(member.getId());
- update.setLevel(nextLevelCode);
- mallMemberMapper.updateById(update);
+ if (StrUtil.isNotBlank(nextLevelCode)) {
+ MallMember update = new MallMember();
+ update.setId(member.getId());
+ update.setLevel(nextLevelCode);
+ mallMemberMapper.updateById(update);
+ }
}
private Date getStartTime(String type) {
--
Gitblit v1.9.1