From 566c44cc5712ab9c997424ee5a5438e0a81a016e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 17 五月 2023 18:49:38 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
index 83397f1..6bb9d6e 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
@@ -22,6 +22,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -68,8 +69,8 @@
// 开始，结束时间
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- Date startTime = DateUtil.getDate_str4(split[0]);
- Date endTime = DateUtil.getDate_str4(split[1]);
+ Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
+ Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
wrapper.between("createTime",startTime,endTime);
}
// 判断是否为代理商
@@ -105,7 +106,7 @@
model.addAttribute("orderSum",orderList.size());
// 过滤已完成和待评价订单，且支付金额在14元以上
List<TOrder> orders = orderList.stream().filter(order -> (order.getState().equals(OrderStateEnum.FINISH.getCode()) || order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()))
- && 0 < order.getPayMoney().compareTo(new BigDecimal("14")) && order.getAgentId().equals(tAgent.getId())).collect(Collectors.toList());
+ && 0 < order.getOrderMoney().compareTo(new BigDecimal("14")) && order.getAgentId().equals(tAgent.getId())).collect(Collectors.toList());
model.addAttribute("validOrder",orders.size());
// 过滤已使用优惠券
List<TOrder> usedCoupon = orderList.stream().filter(order -> (order.getState().equals(OrderStateEnum.FINISH.getCode()) || order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()))
@@ -179,7 +180,7 @@
tAgentResp.setOrderSum(orderList.size());
// 过滤已完成和待评价订单，且支付金额在14元以上
List<TOrder> orders = tOrders.stream().filter(order -> (order.getState().equals(OrderStateEnum.FINISH.getCode()) || order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()))
- && 0 < order.getPayMoney().compareTo(new BigDecimal("14")) && tAgent.getId().equals(order.getAgentId())).collect(Collectors.toList());
+ && 0 < order.getOrderMoney().compareTo(new BigDecimal("14")) && tAgent.getId().equals(order.getAgentId())).collect(Collectors.toList());
tAgentResp.setValidOrder(orders.size());
// 过滤已使用优惠券
List<TOrder> usedCoupon = tOrders.stream().filter(order -> (order.getState().equals(OrderStateEnum.FINISH.getCode()) || order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()))
@@ -236,8 +237,8 @@
Integer agentTotal = tAgentMapper.selectCount(new EntityWrapper<TAgent>()
.eq("id", agentId));
// 代理商最近一个月新增数量
- LocalDate now = LocalDate.now();
- LocalDate localDate = now.plusMonths(1);
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime localDate = now.minusMonths(1);
Integer agentMonthTotal = tAgentMapper.selectCount(new EntityWrapper<TAgent>()
.eq("id", agentId)
.between("createTime", localDate, now));
@@ -253,8 +254,8 @@
Integer agentTotal = tAgentMapper.selectCount(new EntityWrapper<TAgent>()
.in("id", ids));
// 代理商最近一个月新增数量
- LocalDate now = LocalDate.now();
- LocalDate localDate = now.plusMonths(1);
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime localDate = now.minusMonths(1);
Integer agentMonthTotal = tAgentMapper.selectCount(new EntityWrapper<TAgent>()
.in("id", ids)
.between("createTime", localDate, now));
--
Gitblit v1.7.1