明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2024-10-23 ee2bf95f3472a4179ee0fc7c8e4e2a35e1214bc8 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java


@@ -3,9 +3,7 @@




import java.math.BigDecimal;


import java.math.RoundingMode;


import java.time.DayOfWeek;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.*;






import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


@@ -23,6 +21,7 @@


import com.ruoyi.common.core.domain.R;


import com.ruoyi.common.core.dto.ChargingOrderGroup;


import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;


import com.ruoyi.common.core.web.domain.BasePojo;


import com.ruoyi.common.redis.service.RedisService;


import com.ruoyi.common.security.service.TokenService;


import com.ruoyi.common.core.web.domain.AjaxResult;


@@ -65,7 +64,6 @@


import javax.annotation.Resource;


import javax.servlet.http.HttpServletResponse;


import java.io.PrintWriter;


import java.time.YearMonth;


import java.time.format.DateTimeFormatter;


import java.time.temporal.ChronoUnit;


import java.time.temporal.TemporalAdjusters;


@@ -311,15 +309,16 @@


    }




    @ResponseBody


    @PostMapping(value = "/chargingOrderInfo")


    @GetMapping(value = "/chargingOrderInfo")


    @ApiOperation(value = "充电桩订单列表查看详情", tags = {"管理后台-订单管理"})


    public AjaxResult<ChargingOrderInfoVO> chargingOrderInfo(String orderId) {


        TChargingOrder byId = chargingOrderService.getById(orderId);


    public AjaxResult<ChargingOrderInfoVO> chargingOrderInfo(String strategyId) {


        TChargingOrder byId = chargingOrderService.getById(strategyId);


        ChargingOrderInfoVO chargingOrderInfoVO = new ChargingOrderInfoVO();


        chargingOrderInfoVO.setCdElectronic(byId.getCurrent()+"");


        chargingOrderInfoVO.setCdVoltage(byId.getVoltage()+"");


        chargingOrderInfoVO.setSurplus(byId.getTotalElectricity()+"");


        chargingOrderInfoVO.setTotalPower(byId.getPower()+"");




        chargingOrderInfoVO.setCdElectronic(byId.getCurrent()!=null?byId.getCurrent()+"":"");


        chargingOrderInfoVO.setCdVoltage(byId.getVoltage()!=null?byId.getVoltage()+"":"");


        chargingOrderInfoVO.setSurplus(byId.getTotalElectricity()!=null?byId.getTotalElectricity()+"":"");


        chargingOrderInfoVO.setTotalPower(byId.getPower()!=null?byId.getPower()+"":"");


        if (byId.getAppUserCarId()!=null){


            List<TAppUserCar> data = appUserCarClient.getCarByIds(Collections.singletonList(byId.getAppUserCarId())).getData();


            if (!data.isEmpty()){


@@ -331,7 +330,7 @@


        }


        // 时段总服务费


        BigDecimal bigDecimal = new BigDecimal("0");


        List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, orderId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();


        List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, strategyId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();


        for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {


            bigDecimal = bigDecimal.add(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());


            tChargingOrderAccountingStrategy.setVipDiscount(


@@ -693,7 +692,9 @@


        BigDecimal data2 =   vipOrderService.getSumAmout(sixBefore);


        map.put("vipAmount",data2);




    return R.ok(map);






        return R.ok(map);


    }




    @Resource


@@ -817,6 +818,7 @@


        }


        List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getStartTime, start).le(TChargingOrder::getEndTime, end).in(TChargingOrder::getSiteId, siteIds).list();


        List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());


        chargingOrderIds.add(-1L);


        //上方饼图


         List<Map<String,Object>> maps =   chargingOrderService.getSumByType(chargingOrderIds);




@@ -953,16 +955,18 @@


            tCharingUserMapVO.setMap(dateRangeStatistics);






            List<Map<String,Object>> map1 =  chargingOrderService.usersByQuery(statisticsQueryDto);


            List<Map<String,Object>> map1 =  chargingOrderService.usersByQuery1(statisticsQueryDto);








            LocalDate startDate1 = statisticsQueryDto.getStartTime();


            LocalDate endDate1 = statisticsQueryDto.getEndTime();




            List<Map<String, Object>> dateRangeStatistics1 = new ArrayList<>();




            // 遍历日期范围


            while (!startDate.isAfter(endDate)) {


                String formattedDate = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));


            while (!startDate1.isAfter(endDate1)) {


                String formattedDate = startDate1.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));


                Map<String, Object> dailyStats = findMapWithDateValue(map1, formattedDate);




                if (dailyStats != null) {


@@ -975,7 +979,7 @@


                }




                // 移动到下一天


                startDate = startDate.plusDays(1);


                startDate1 = startDate1.plusDays(1);


            }




            tCharingUserMapVO.setMap1(dateRangeStatistics1);


@@ -1159,7 +1163,15 @@


        } else {


            siteIds.add(statisticsQueryDto.getSiteId());


        }


        List<TChargingOrder> list = chargingOrderService.lambdaQuery().in(!siteIds.isEmpty(), TChargingOrder::getSiteId, siteIds).eq(statisticsQueryDto.getSiteId() != null, TChargingOrder::getSiteId, statisticsQueryDto.getSiteId()).list();


        LocalDateTime selectDate = statisticsQueryDto.getSelectDate();


        LocalDateTime min = selectDate.with(LocalTime.MIN);


        LocalDateTime max = selectDate.with(LocalTime.MAX);












        List<TChargingOrder> list = chargingOrderService.lambdaQuery().in(!siteIds.isEmpty(), TChargingOrder::getSiteId, siteIds).ge( TChargingOrder::getCreateTime,min).le(BasePojo::getCreateTime,max).eq(statisticsQueryDto.getSiteId() != null, TChargingOrder::getSiteId, statisticsQueryDto.getSiteId()).list();


        //当日的订单总数


        int size = list.size();


        //计算list中paymentAmount的总和