From 5a3e888042c61e37c2470930939c9edfdd41f7c9 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 10 十月 2024 17:32:22 +0800
Subject: [PATCH] 1.合伙人账单统计
---
src/main/java/com/mzl/flower/service/point/CustomerPointService.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 0d71990..9950f12 100644
--- a/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
+++ b/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
@@ -15,6 +15,8 @@
import com.mzl.flower.mapper.point.CustomerPointDetailMapper;
import com.mzl.flower.mapper.point.CustomerPointMapper;
import com.mzl.flower.service.BaseService;
+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;
@@ -47,6 +49,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);
@@ -182,6 +190,7 @@
.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);
}
--
Gitblit v1.9.3