Pu Zhibing
2025-01-16 8453a342552632b4e5a6ee8597a03b47fd84a13f
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -140,6 +140,10 @@
    private TOrderInvoiceService invoiceService;
    @Resource
    private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
    @Resource
    private PartnerClient partnerClient;
    @Resource
    private SysUserClient sysUserClient;
    
    
    
@@ -230,7 +234,7 @@
        data.setRecords(res1);
        return R.ok(data);
    }
public static List<PayOrderDto> testing5(long total, long current, long size, List<PayOrderDto> str){
    public static List<PayOrderDto> testing5(long total, long current, long size, List<PayOrderDto> str){
    List<PayOrderDto> result = new ArrayList<>();
    //获取初始化分页结构
    com.ruoyi.order.util.Page<PayOrderDto> page = new com.ruoyi.order.util.Page().getPage(total, size, current - 1);
@@ -780,6 +784,13 @@
    }
    
    
//    @PostMapping("/endChargeBillingCharge1")
//    public void endChargeBillingCharge1(@RequestBody TransactionRecordMessageVO vo){
//        log.info("-------------------停止充电返回账单后计算费用及修改业务状态-------------------:" + vo);
//        chargingOrderService.endChargeBillingCharge1(vo);
//    }
    
    
    @RequiresPermissions(value = {"/platformRevenueAnalysis"}, logical = Logical.OR)
@@ -957,10 +968,7 @@
        return R.ok(map);
    }
    @Resource
    private PartnerClient partnerClient;
    @Resource
    private SysUserClient sysUserClient;
    @RequiresPermissions(value = {"/chargeOrderMonitoring"}, logical = Logical.OR)
    @ResponseBody
    @PostMapping(value = "/watch/chargingOrder")