From 2f30ea680b7867cc42681d8eff7b55f5fdf15201 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 22 一月 2025 11:34:31 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 131e1fe..0db7e43 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -234,6 +234,9 @@
         data.setRecords(res1);
         return R.ok(data);
     }
+    
+    
+    
     public static List<PayOrderDto> testing5(long total, long current, long size, List<PayOrderDto> str){
     List<PayOrderDto> result = new ArrayList<>();
     //获取初始化分页结构
@@ -255,6 +258,9 @@
     }
     return result;
 }
+
+
+
     @ResponseBody
     @PostMapping(value = "/pay/order/refund")
     @ApiOperation(value = "退款", tags = {"管理后台-支付订单-订单信息"})
@@ -325,6 +331,10 @@
         return R.ok();
 
     }
+    
+    
+    
+    
     @ResponseBody
     @GetMapping(value = "/pay/order/refund/detail")
     @ApiOperation(value = "退款信息", tags = {"管理后台-支付订单-订单信息"})
@@ -470,6 +480,10 @@
         }
         return result;
     }
+    
+    
+    
+    
     @ResponseBody
     @PostMapping(value = "/pay/order/refund/list1")
     @ApiOperation(value = "列表1", tags = {"管理后台-支付订单-退款订单"})
@@ -578,6 +592,8 @@
                 .between(TChargingOrder::getStartTime, req.getStartTime(), req.getEndTime())).size();
         return R.ok(size);
     }
+    
+    
     //用户订单数量
     @PostMapping(value = "/useOrderCount")
     public R<Long> useOrderCount(@RequestParam("userId") Long userId) {
@@ -586,12 +602,16 @@
         return R.ok(count);
     }
 
+    
+    
     //订单详情
     @PostMapping(value = "/detail")
     public R<TChargingOrder> detail(@RequestParam("orderId") Long orderId) {
         return R.ok(chargingOrderService.getById(orderId));
     }
 
+    
+    
     @PostMapping(value = "/getList")
     public R<List<TChargingOrder>> getList(@RequestParam("siteId") Integer siteId) {
 
@@ -599,6 +619,8 @@
         return R.ok(list);
     }
 
+    
+    
     @PostMapping(value = "/getBySiteIdAndTime")
     public R<List<ChargingOrderGroup>> getBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto) {
 
@@ -783,12 +805,6 @@
         chargingOrderService.endChargeBillingCharge(vo);
     }
     
-    
-//    @PostMapping("/endChargeBillingCharge1")
-//    public void endChargeBillingCharge1(@RequestBody TransactionRecordMessageVO vo){
-//        log.info("-------------------停止充电返回账单后计算费用及修改业务状态-------------------:" + vo);
-//        chargingOrderService.endChargeBillingCharge1(vo);
-//    }
     
     
     

--
Gitblit v1.7.1