From 77e61061c97b5907dae0eb509785a08fa965fb82 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 27 九月 2024 18:27:26 +0800
Subject: [PATCH] add: 会员优化创建人
---
src/main/java/com/mzl/flower/dto/response/member/MemberVO.java | 3 +++
src/main/java/com/mzl/flower/service/menber/impl/MemberServiceImpl.java | 15 +++++++++++++++
2 files changed, 18 insertions(+), 0 deletions(-)
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 8e197f1..e57d2a7 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
@@ -59,4 +59,7 @@
@ApiModelProperty(value = "会员成长值获取规则")
private String growthValueDesc;
+
+ @ApiModelProperty("更新人")
+ private String updateBy;
}
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 9cf0d44..269e418 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
@@ -9,13 +9,16 @@
import com.mzl.flower.dto.request.menber.MemberQueryDTO;
import com.mzl.flower.dto.response.member.MemberVO;
import com.mzl.flower.entity.menber.Member;
+import com.mzl.flower.entity.system.User;
import com.mzl.flower.mapper.customer.CustomerMapper;
import com.mzl.flower.mapper.member.MemberMapper;
import com.mzl.flower.service.menber.MemberService;
+import com.mzl.flower.service.system.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
@@ -37,6 +40,8 @@
private final MemberMapper memberMapper;
private final CustomerMapper customerMapper;
+
+ private final UserService userService;
@Override
public void saveMember(MemberDTO memberDTO) {
@@ -210,6 +215,16 @@
@Override
public Page<MemberVO> queryPage(MemberQueryDTO memberQueryDTO, Page page) {
List<MemberVO> list = memberMapper.queryPage(memberQueryDTO, page);
+ if(!CollectionUtils.isEmpty(list)){
+ list.forEach(l->{
+ if (!StringUtils.isEmpty(l.getUpdateBy())) {
+ User userById = userService.getUserById(l.getUpdateBy());
+ if(!ObjectUtils.isEmpty(userById)){
+ l.setCreateName(userById.getNickName());
+ }
+ }
+ });
+ }
page.setRecords(list);
return page;
}
--
Gitblit v1.9.3