From 1114093aefc3cd8ce595baac33d7263632d941e8 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 14 九月 2024 15:45:48 +0800
Subject: [PATCH] add:会员区间管理，图片管理
---
src/main/java/com/mzl/flower/entity/menber/Member.java | 7 +++
src/main/java/com/mzl/flower/web/login/PartnerLoginController.java | 4 +-
src/main/java/com/mzl/flower/dto/response/member/MemberVO.java | 7 +++
src/main/java/com/mzl/flower/mapper/member/MemberMapper.java | 6 +++
src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java | 27 +++++++++++--
src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java | 10 +++++
6 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java b/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java
index a4512be..bd069ad 100644
--- a/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java
@@ -1,5 +1,6 @@
package com.mzl.flower.dto.request.menber;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -46,4 +47,13 @@
@NotNull
private int downgradeValue;
+
+ @ApiModelProperty("背景")
+ @NotNull
+ private String background;
+
+ @ApiModelProperty("图片")
+ @NotNull
+ private String pictures;
+
}
diff --git a/src/main/java/com/mzl/flower/dto/response/member/MemberVO.java b/src/main/java/com/mzl/flower/dto/response/member/MemberVO.java
index 8535b30..30aa7ca 100644
--- a/src/main/java/com/mzl/flower/dto/response/member/MemberVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/member/MemberVO.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -50,4 +51,10 @@
@ApiModelProperty("操作人")
private String createName;
+
+ @ApiModelProperty("背景")
+ private String background;
+
+ @ApiModelProperty("图片")
+ private String pictures;
}
diff --git a/src/main/java/com/mzl/flower/entity/menber/Member.java b/src/main/java/com/mzl/flower/entity/menber/Member.java
index 6d7de0f..b23f218 100644
--- a/src/main/java/com/mzl/flower/entity/menber/Member.java
+++ b/src/main/java/com/mzl/flower/entity/menber/Member.java
@@ -1,5 +1,6 @@
package com.mzl.flower.entity.menber;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.mzl.flower.base.BaseAutoEntity;
import io.swagger.annotations.ApiModelProperty;
@@ -45,4 +46,10 @@
@ApiModelProperty("未消费产生的下降值")
private int downgradeValue;
+
+ @ApiModelProperty("背景")
+ private String background;
+
+ @ApiModelProperty("图片")
+ private String pictures;
}
diff --git a/src/main/java/com/mzl/flower/mapper/member/MemberMapper.java b/src/main/java/com/mzl/flower/mapper/member/MemberMapper.java
index 9d705c4..e1081ba 100644
--- a/src/main/java/com/mzl/flower/mapper/member/MemberMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/member/MemberMapper.java
@@ -42,4 +42,10 @@
List<MemberVO> queryPage(@Param("dto") MemberQueryDTO dto, Page page);
+ @Select("select * from t_member where deleted = '0'")
+ List<Member> getAllMember();
+
+ @Select("select * from t_member where deleted = '0' and id != #{id} ")
+ List<Member> getOtherAllMember(@Param("id") Long id);
+
}
diff --git a/src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java b/src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java
index 16fcf32..fef0691 100644
--- a/src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java
@@ -42,12 +42,12 @@
public void saveMember(MemberDTO memberDTO) {
//是否已经存在endpoint已经有最大值了，有的话需要删除或者修改
if (memberDTO.getEndPoint() == null) {
- Member pointByIntegerMaxValue = memberMapper.getEndPointByIntegerMaxValue(Integer.MAX_VALUE);
- if (!ObjectUtils.isEmpty(pointByIntegerMaxValue)) {
- throw new ValidationException("系统中已经有一条最大值或者空值记录，请删除或者修改再保存");
- } else {
+// Member pointByIntegerMaxValue = memberMapper.getEndPointByIntegerMaxValue(Integer.MAX_VALUE);
+// if (!ObjectUtils.isEmpty(pointByIntegerMaxValue)) {
+// throw new ValidationException("系统中已经有一条最大值或者空值记录，请删除或者修改再保存");
+// } else {
memberDTO.setEndPoint(Integer.MAX_VALUE);
- }
+// }
}
if (StringUtils.isEmpty(memberDTO.getName())) {
throw new ValidationException("会员等级名称不能为空");
@@ -76,6 +76,14 @@
throw new ValidationException("会员折扣百分比不能大于100");
}
}
+ //区间交集判断
+ //查询所有等级
+ List<Member> allMember = memberMapper.getAllMember();
+ allMember.forEach(a -> {
+ if (a.getStartPoint() < memberDTO.getEndPoint() && a.getEndPoint() > memberDTO.getStartPoint()) {
+ throw new ValidationException("存在交集，不允许保存");
+ }
+ });
if (!StringUtils.isEmpty(memberDTO.getDiscountAmount())) {
int discountAmount = memberDTO.getDiscountAmount().compareTo(BigDecimal.ZERO);
if (discountAmount == -1) {
@@ -163,6 +171,15 @@
if (memberDTO.getStartPoint() > memberDTO.getEndPoint()) {
throw new ValidationException("成长点开始不能大于结束");
}
+ //区间交集判断
+ //查询所有等级
+ List<Member> allMember = memberMapper.getOtherAllMember(memberDTO.getId());
+ allMember.forEach(a -> {
+ if (a.getStartPoint() < memberDTO.getEndPoint() && a.getEndPoint() > memberDTO.getStartPoint()) {
+ throw new ValidationException("存在交集，不允许修改");
+ }
+ });
+
//更新会员等级
if (memberInfo.getStartPoint() != memberDTO.getStartPoint() || memberInfo.getEndPoint() != memberDTO.getEndPoint()) {
customerMapper.updateMemberLevelByPoint(memberInfo.getId(), memberInfo.getStartPoint(), memberInfo.getEndPoint());
diff --git a/src/main/java/com/mzl/flower/web/login/PartnerLoginController.java b/src/main/java/com/mzl/flower/web/login/PartnerLoginController.java
index b7ffa9e..10b0790 100644
--- a/src/main/java/com/mzl/flower/web/login/PartnerLoginController.java
+++ b/src/main/java/com/mzl/flower/web/login/PartnerLoginController.java
@@ -96,7 +96,7 @@
String tokenCache = stringCacheClient.get(TOKEN_KEY + SEPARATOR + user.getId());
if (StringUtils.isNotBlank(tokenCache)) {
//强制删除token，下线
- removeToken(tokenCache,user.getId());
+// removeToken(tokenCache,user.getId());
}
try {
PartnerAuthenticationToken authRequest = new PartnerAuthenticationToken(username, password);
@@ -139,7 +139,7 @@
String tokenCache = stringCacheClient.get(TOKEN_KEY + SEPARATOR + user.getId());
if (StringUtils.isNotBlank(tokenCache)) {
//强制删除token，下线
- removeToken(tokenCache,user.getId());
+// removeToken(tokenCache,user.getId());
}
try {
PhoneAuthenticationToken authRequest = new PhoneAuthenticationToken(tel, smsCode, Constants.USER_TYPE.partner.name());
--
Gitblit v1.9.3