From da3441a507573988ad290c8abb8026da64636468 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 03 九月 2024 09:52:29 +0800
Subject: [PATCH] add：当前用户增加积分信息返回
---
src/main/java/com/mzl/flower/service/customer/CustomerService.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/customer/CustomerService.java b/src/main/java/com/mzl/flower/service/customer/CustomerService.java
index 564e32a..0081055 100644
--- a/src/main/java/com/mzl/flower/service/customer/CustomerService.java
+++ b/src/main/java/com/mzl/flower/service/customer/CustomerService.java
@@ -10,6 +10,7 @@
import com.mzl.flower.dto.request.customer.ChangePartnerDTO;
import com.mzl.flower.dto.request.customer.QueryCustomerDTO;
import com.mzl.flower.dto.request.customer.UpdateCustomerDTO;
+import com.mzl.flower.dto.request.menber.UserGrowthRecordDTO;
import com.mzl.flower.dto.response.customer.CustomerDTO;
import com.mzl.flower.dto.response.partner.PartnerDTO;
import com.mzl.flower.entity.customer.Customer;
@@ -17,12 +18,15 @@
import com.mzl.flower.enums.TrueOrFalseEnum;
import com.mzl.flower.mapper.customer.CustomerMapper;
import com.mzl.flower.mapper.partner.PartnerMapper;
+import com.mzl.flower.service.menber.MemberGrowthRecordService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import javax.annotation.Resource;
import java.util.List;
@Service
@@ -34,6 +38,8 @@
private final CustomerMapper customerMapper;
private final PartnerMapper partnerMapper;
+ @Resource
+ private MemberGrowthRecordService memberGrowthRecordService;
public CustomerService(CustomerMapper customerMapper, PartnerMapper partnerMapper) {
this.customerMapper = customerMapper;
@@ -41,7 +47,12 @@
}
public CustomerDTO getCurrentCustomer() {
- return customerMapper.getCurrentCustomer(SecurityUtils.getUserId());
+ CustomerDTO currentCustomer = customerMapper.getCurrentCustomer(SecurityUtils.getUserId());
+ UserGrowthRecordDTO userGrowthRecordDTO = memberGrowthRecordService.getInfoByUserId(SecurityUtils.getUserId());
+ if(!ObjectUtils.isEmpty(userGrowthRecordDTO)){
+ currentCustomer.setUserGrowthRecord(userGrowthRecordDTO);
+ }
+ return currentCustomer;
}
public PartnerDTO getCurrentBindPartner() {
--
Gitblit v1.9.3