From 7fffe9efd9e363941f5506f6476f86ffa0500deb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 04 三月 2025 10:16:39 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 05be148..968a695 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
@@ -468,6 +468,10 @@
return refundList1;
}
+
+
+
+
public static List<TChargingOrderRefund> testing4(long total, long current, long size, List<TChargingOrderRefund> str){
List<TChargingOrderRefund> result = new ArrayList<>();
//获取初始化分页结构
@@ -518,11 +522,8 @@
}
- public static void main(String[] args) {
- String temp = "00";
- Integer i = Integer.valueOf(temp);
- System.err.println(i);
- }
+
+
@RequiresPermissions(value = {"/chargingPileOrder/monitoring_record"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/chargingOrderInfo")
@@ -551,14 +552,18 @@
for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
String format = "";
String format1 = "";
- String temp1=list.get(0).getStartTime().split(":")[0];
- String[] split = tChargingOrderAccountingStrategy.getStartTime().split(":");
+// String temp1=list.get(0).getStartTime().split(":")[0];
+ System.err.println("订单详情时间第一条"+list.get(0).getStartTime());
+ System.err.println("订单详情时间开始"+tChargingOrderAccountingStrategy.getStartTime());
+ System.err.println("订单详情时间结束"+tChargingOrderAccountingStrategy.getEndTime());
+ String temp1=list.get(0).getStartTime().split(" ")[1].split(":")[0];
+ String[] split = tChargingOrderAccountingStrategy.getStartTime().split(" ")[1].split(":");
if (Integer.parseInt(split[0])>=Integer.valueOf(temp1)){
format = byId.getCreateTime().format(formatter);
}else {
format = byId.getEndTime().format(formatter);
}
- String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(":");
+ String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(" ")[1].split(":");
if (Integer.parseInt(split1[0])<Integer.valueOf(temp1)){
format1 = byId.getCreateTime().format(formatter);
}else {
@@ -581,6 +586,9 @@
return AjaxResult.success(chargingOrderInfoVO);
}
+
+
+
@ResponseBody
@PostMapping(value = "/addEvaluate")
@ApiOperation(value = "添加评价", tags = {"小程序-扫一扫"})
@@ -589,6 +597,9 @@
orderEvaluateService.addOrderEvaluate(dto);
return AjaxResult.success();
}
+
+
+
/**
* 查询用户最近一次充电记录使用的车辆
*
@@ -608,6 +619,9 @@
return R.ok(-1L);
}
}
+
+
+
/**
* 查询会员在本月有多少次享受了充电折扣
--
Gitblit v1.7.1