超省新代驾
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2023-05-18 ad86e0cb28f4301c4935bea43e4ebd824338390e 
 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;




@@ -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));