From 6c823dd44dbde79f008001a2a11e7bf9bc6bf8cc Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 04 十二月 2024 18:15:44 +0800
Subject: [PATCH] fix:合伙人列表操作日志
---
src/main/java/com/mzl/flower/service/point/CustomerPointService.java | 151 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 118 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/point/CustomerPointService.java b/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
index 3d225f9..9d1307e 100644
--- a/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
+++ b/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.dto.request.point.ChangePointDTO;
import com.mzl.flower.dto.request.point.QueryCustomerPointDTO;
@@ -14,11 +15,16 @@
import com.mzl.flower.mapper.point.CustomerPointDetailMapper;
import com.mzl.flower.mapper.point.CustomerPointMapper;
import com.mzl.flower.service.BaseService;
+import com.mzl.flower.service.payment.RedisLockService;
+import com.mzl.flower.utils.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.util.ArrayList;
import java.util.List;
import com.mzl.flower.constant.Constants.*;
@@ -31,10 +37,13 @@
private final CustomerPointDetailMapper customerPointDetailMapper;
+ private final RedisLockService redisLockService;
- public CustomerPointService(CustomerPointMapper customerPointMapper, CustomerPointDetailMapper customerPointDetailMapper) {
+
+ public CustomerPointService(CustomerPointMapper customerPointMapper, CustomerPointDetailMapper customerPointDetailMapper, RedisLockService redisLockService) {
this.customerPointMapper = customerPointMapper;
this.customerPointDetailMapper = customerPointDetailMapper;
+ this.redisLockService = redisLockService;
}
public Page<CustomerPointDTO> queryPage(QueryCustomerPointDTO dto, Page page) {
@@ -44,6 +53,12 @@
}
public Page<CustomerPointDetailDTO> queryCustomerDetails(QueryPointDetailDTO dto, Page page) {
+ if(StringUtils.isNotBlank(dto.getCreateTimeStartStr())){
+ dto.setCreateTimeStart(DateUtils.dateTimeStringToLocalDateTime(dto.getCreateTimeStartStr()));
+ }
+ if(StringUtils.isNotBlank(dto.getCreateTimeEndStr())){
+ dto.setCreateTimeEnd(DateUtils.dateTimeStringToLocalDateTime(dto.getCreateTimeEndStr()));
+ }
List<CustomerPointDetailDTO> list = customerPointMapper.queryCustomerDetails(dto, page);
page.setRecords(list);
@@ -68,43 +83,51 @@
}
public void updateCustomerPoint(CustomerPointDetail detail) {
- CustomerPoint point = customerPointMapper.selectOne(new LambdaQueryWrapper<CustomerPoint>()
- .eq(CustomerPoint::getCustomerId, detail.getCustomerId()));
- boolean isAdd = false;
- if(point == null){
- isAdd = true;
- point = new CustomerPoint();
- point.setCustomerId(detail.getCustomerId());
- point.setUserId(detail.getUserId());
- point.setTotalPoint(0);
- point.setUsedPoint(0);
- point.setExpiredPoint(0);
- point.setDeductionPoint(0);
- point.create(SecurityUtils.getUserId());
+ boolean lock = redisLockService.getObjectLock("LOCK_KEY_CUSTOMER_POINT_", detail.getUserId());
+ if(!lock){
+ return;
}
+ try {
+ CustomerPoint point = customerPointMapper.selectOne(new LambdaQueryWrapper<CustomerPoint>()
+ .eq(CustomerPoint::getCustomerId, detail.getCustomerId()));
+ boolean isAdd = false;
+ if(point == null){
+ isAdd = true;
+ point = new CustomerPoint();
+ point.setCustomerId(detail.getCustomerId());
+ point.setUserId(detail.getUserId());
+ point.setTotalPoint(0);
+ point.setUsedPoint(0);
+ point.setExpiredPoint(0);
+ point.setDeductionPoint(0);
+ point.create(SecurityUtils.getUserId());
+ }
- if(POINT_CHANGE_TYPE.add.name().equals(detail.getChangeType())){
- point.setTotalPoint(point.getTotalPoint() + detail.getPoint());
- }else if(POINT_CHANGE_TYPE.reduce.name().equals(detail.getChangeType())){
- if(POINT_TYPE.deduction.name().equals(detail.getType())){ //积分扣减
- Integer balancePoint = point.getTotalPoint() - point.getUsedPoint()-point.getExpiredPoint()-point.getDeductionPoint();//可用积分
- balancePoint = balancePoint.intValue()>0?balancePoint.intValue():0;
- if(balancePoint.intValue() >= detail.getPoint().intValue()){
- point.setDeductionPoint(point.getDeductionPoint() + detail.getPoint());
- }else{
- //积分不足，直接清0
- point.setDeductionPoint(point.getUsedPoint() + balancePoint);
- detail.setPoint(balancePoint);
- detail.setRemarks(detail.getRemarks()+",积分不足，扣除积分"+balancePoint);
+ if(POINT_CHANGE_TYPE.add.name().equals(detail.getChangeType())){
+ point.setTotalPoint(point.getTotalPoint() + detail.getPoint());
+ }else if(POINT_CHANGE_TYPE.reduce.name().equals(detail.getChangeType())){
+ Integer detailPoint = detail.getPoint();
+ if(POINT_TYPE.deduction.name().equals(detail.getType())){ //积分扣减
+ Integer balancePoint = point.getTotalPoint() - point.getUsedPoint()-point.getExpiredPoint()-point.getDeductionPoint();//可用积分
+ balancePoint = balancePoint.intValue()>0?balancePoint.intValue():0;
+ if(balancePoint.intValue() >= detail.getPoint().intValue()){
+ point.setDeductionPoint(point.getDeductionPoint() + detail.getPoint());
+ }else{
+ //积分不足，直接清0
+ point.setDeductionPoint(point.getDeductionPoint() + balancePoint);
+ detail.setPoint(balancePoint);
+ detail.setRemarks(detail.getRemarks()+",当前积分不足"+detailPoint+"，实际扣除积分"+balancePoint);
+ }
}
}
+ if(isAdd){
+ customerPointMapper.insert(point);
+ }else{
+ customerPointMapper.updateById(point);
+ }
+ }finally {
+ redisLockService.releaseObjectLock("LOCK_KEY_CUSTOMER_POINT_", detail.getUserId());
}
- if(isAdd){
- customerPointMapper.insert(point);
- }else{
- customerPointMapper.updateById(point);
- }
-
}
public void deductionPoint(ChangePointDTO dto) {
@@ -141,4 +164,66 @@
//更新汇总表
updateCustomerPoint(detail);
}
+
+ public void signIn() {
+ if(signToday()){
+ throw new ValidationException("今天已经签到过了");
+ }
+ int signNum = customerPointDetailMapper
+ .selectCount(new LambdaQueryWrapper<CustomerPointDetail>()
+ .eq(CustomerPointDetail::getUserId, SecurityUtils.getUserId())
+ .ge(CustomerPointDetail::getRecordDate,LocalDate.now().minusDays(9))
+ .eq(CustomerPointDetail::getChangeType,POINT_CHANGE_TYPE.add.name())
+ .eq(CustomerPointDetail::getType,POINT_TYPE.sign.name())
+ );
+ int point = 1;
+ if(signNum==9){
+ point = 3;
+ }
+ CustomerPointDetail detail = new CustomerPointDetail();
+ Customer customer = getCurrentCustomer();
+ detail.setCustomerId(customer.getId());
+ detail.setUserId(customer.getUserId());
+ detail.setPoint(point);
+ detail.setRemarks("签到");
+ detail.setRecordDate(LocalDate.now());
+ detail.setChangeType(POINT_CHANGE_TYPE.add.name());
+ detail.setType(POINT_TYPE.sign.name());
+ detail.create(SecurityUtils.getUserId());
+ customerPointDetailMapper.insert(detail);
+
+ //更新汇总表
+ updateCustomerPoint(detail);
+ }
+
+ public List<CustomerPointDetailDTO> signList(LocalDate startDate, LocalDate endDate) {
+ LambdaQueryWrapper<CustomerPointDetail> lambdaQueryWrapper = new LambdaQueryWrapper<CustomerPointDetail>()
+ .eq(CustomerPointDetail::getUserId, SecurityUtils.getUserId())
+ .eq(CustomerPointDetail::getChangeType, POINT_CHANGE_TYPE.add.name())
+ .eq(CustomerPointDetail::getType, POINT_TYPE.sign.name());
+ lambdaQueryWrapper.orderByDesc(CustomerPointDetail::getRecordDate);
+ if(startDate!=null){
+ lambdaQueryWrapper.ge(CustomerPointDetail::getRecordDate,startDate);
+ }
+ if (endDate != null) {
+ lambdaQueryWrapper.le(CustomerPointDetail::getRecordDate, endDate);
+ }
+
+ List<CustomerPointDetail> details = customerPointDetailMapper.selectList(lambdaQueryWrapper);
+ List<CustomerPointDetailDTO> dtos = new ArrayList<>();
+ for (CustomerPointDetail detail : details) {
+ CustomerPointDetailDTO dto = new CustomerPointDetailDTO();
+ BeanUtils.copyProperties(detail, dto);
+ dtos.add(dto);
+ }
+ return dtos;
+ }
+
+ public Boolean signToday() {
+ return customerPointDetailMapper.selectCount(new LambdaQueryWrapper<CustomerPointDetail>()
+ .eq(CustomerPointDetail::getUserId, SecurityUtils.getUserId())
+ .eq(CustomerPointDetail::getRecordDate,LocalDate.now())
+ .eq(CustomerPointDetail::getChangeType,POINT_CHANGE_TYPE.add.name())
+ .eq(CustomerPointDetail::getType,POINT_TYPE.sign.name()))>0;
+ }
}
--
Gitblit v1.9.3