修改bug

Pu Zhibing

1 天以前 99eddbebf80c5549a7487caed95b041abdc9bb5f

修改bug

 ruoyi-api/ruoyi-api-jianguan/src/main/java/com/ruoyi/integration/api/feignClient/ChargingMessageClient.java

@@ -30,6 +30,6 @@
     * @param chargingOrder
     * @return
     */
    @PostMapping("/chargingMessage/pushOrderInfo")
    @PostMapping("/chargingMessage/pushOrderStatus")
    R pushOrderStatus(@RequestBody ChargingOrderVo chargingOrder);
}

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java

@@ -176,6 +176,11 @@
        }
        Site site = siteService.getById(chargingPile.getSiteId());
        TAccountingStrategy accountingStrategy = accountingStrategyService.getById(site.getAccountingStrategyId());
        if(null == accountingStrategy){
            List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()));
            accountingStrategy = accountingStrategyService.getById(list.get(0).getAccountingStrategyId());
        }
        
        TAccountingStrategyDetail one = accountingStrategyDetailService.getOne(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
                .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId())
                .last(" and DATE_FORMAT(now(), '%H:%i') between start_time and (if(end_time = '00:00', '23:59', end_time))"));

 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/TaskUtil.java

@@ -60,7 +60,7 @@
     */
    @Scheduled(fixedRate = 60000)
    public void taskPushOrderStatus(){
//        pushOrderStatus();
        pushOrderStatus();
    }
    
    

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -2341,6 +2341,9 @@
            
            //获取订单的计费策略
            List<AccountingStrategyDetailOrder> accountingStrategyDetailOrderList = accountingStrategyDetailOrderClient.getAllAccountingStrategyDetailOrder(chargingOrder.getId()).getData();
            if(accountingStrategyDetailOrderList.isEmpty()){
                return R.fail("计费策略为空，无法计算费用");
            }
            accountingStrategyDetailOrderList.get(accountingStrategyDetailOrderList.size() - 1).setEndTime("23:59");
            //开始处理计费明细数据和优惠数据
            chargingOrderAccountingStrategyService.remove(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId()));

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java

@@ -131,13 +131,16 @@
                    BeanUtils.copyProperties(one, vo);
                    R r = chargingOrderService.endChargeBillingCharge(vo);
                    log.info("定时任务执行，充电中的订单处理结果：{}", JSON.toJSONString(r));
                    
                    if(200 == r.getCode()){
                        order = chargingOrderService.getById(order.getId());
                        //推送监管平台订单状态和订单详情
                        ChargingOrderVo chargingOrderVo = new ChargingOrderVo();
                        BeanUtils.copyProperties(order, chargingOrderVo);
                        chargingMessageClient.pushOrderInfo(chargingOrderVo);
                        chargingMessageClient.pushOrderStatus(chargingOrderVo);
                    }
                }
    
                //推送监管平台订单状态和订单详情
                ChargingOrderVo chargingOrderVo = new ChargingOrderVo();
                BeanUtils.copyProperties(order, chargingOrderVo);
                chargingMessageClient.pushOrderInfo(chargingOrderVo);
                chargingMessageClient.pushOrderStatus(chargingOrderVo);
            }
        }
    }