From 724a40af86d31452ec0c4a6c611c4580e2b18ac5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 四月 2026 01:07:17 +0800
Subject: [PATCH] 删除seata依赖和修改报表问题
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 7002466..c077d08 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -73,8 +73,6 @@
import com.ruoyi.payment.api.vo.*;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
-import io.seata.spring.annotation.GlobalTransactional;
-import org.redisson.Redisson;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.slf4j.Logger;
@@ -1820,13 +1818,15 @@
if (StringUtils.hasLength(dto.getStartTime())) {
String[] split = dto.getStartTime().split(" - ");
startTime1 = split[0];
- startTime2 = split[1];
+ String[] split1 = split[1].split(":");
+ startTime2 = split1[0] + ":" + split1[1] + ":59";
}
if (StringUtils.hasLength(dto.getEndTime())) {
String[] split = dto.getEndTime().split(" - ");
endTime1 = split[0];
- endTime2 = split[1];
+ String[] split1 = split[1].split(":");
+ endTime2 = split1[0] + ":" + split1[1] + ":59";
}
ChargingOrderTimeVO chargingOrderTimeVO = new ChargingOrderTimeVO();
if (StringUtils.hasLength(dto.getPhone())) {
--
Gitblit v1.7.1