Pu Zhibing
昨天 ab71786f3018e33a8225a52dfd2e2d8bbb4e2258
修改bug
2个文件已修改
1个文件已添加
14 ■■■■ 已修改文件
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/GetChargingGunByChargingPileIdsVo.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/GetChargingGunByChargingPileIdsVo.java
New file
@@ -0,0 +1,11 @@
package com.ruoyi.chargingPile.api.vo;
import lombok.Data;
import java.util.List;
@Data
public class GetChargingGunByChargingPileIdsVo {
    List<Integer> chargingPileIds;
}
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java
@@ -54,7 +54,6 @@
            List<TChargingOrder> list = list1.stream().filter(e ->e.getCreateTime().toString().contains(time)).collect(Collectors.toList());
            if(!list.isEmpty()){
                System.out.println(list);
                list.stream().forEach(e -> {
                    if(e.getChargingPower()==null){
                        e.setChargingPower(BigDecimal.ZERO);
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
@@ -191,7 +191,7 @@
                    R r = chargingOrderService.endChargeBillingCharge(vo);
                    log.info("定时任务执行,停止中的订单处理结果:{}", JSON.toJSONString(r));
                }else{
//                    endOrder(order);
                    endOrder(order);
                }
            }
            //处理状态为充电中,但硬件已完成的订单