From 000904e9c419e67d3538bb5ccc8da02f8d1c22cf Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 29 Jan 2024 23:41:22 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java | 6 ++++++
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 1 +
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 2 ++
src/main/java/cc/mrbird/febs/mall/entity/MallGoodsCoupon.java | 1 -
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 1 +
5 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
index 049acc1..08eda2d 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -20,6 +20,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -608,6 +609,7 @@
@PostMapping("vipLevelSetUpdate")
public FebsResponse vipLevelSetUpdate(MallMember member) {
+ member.setVipLevelTime(new Date());
mallMemberService.updateById(member);
return new FebsResponse().success().message("操作成功");
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallGoodsCoupon.java b/src/main/java/cc/mrbird/febs/mall/entity/MallGoodsCoupon.java
index 1cffe8d..6ba6c2b 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallGoodsCoupon.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallGoodsCoupon.java
@@ -26,5 +26,4 @@
//减免金额
private BigDecimal realAmount;
-
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java
index 3143fff..c922737 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java
@@ -21,4 +21,10 @@
private Integer state;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date expireTime;
+
+ /**
+ * 来源类型 1-默认 2-积分权益 3-失活会员
+ */
+ private Integer fromType;
+
}
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 1cdb4e1..44545ba 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,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);
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 02c7c50..fa1618c 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
@@ -147,6 +147,7 @@
MallMember update = new MallMember();
update.setId(member.getId());
update.setLevel(nextLevelCode);
+ update.setVipLevelTime(new Date());
mallMemberMapper.updateById(update);
}
}
--
Gitblit v1.9.1