From d6e09bae199e8980f97dd4cdd2000ab6c2b7f06b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 22 五月 2026 10:10:51 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
index f6e065d..878fc77 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
@@ -260,12 +260,12 @@
R r = chargingOrderService.endChargeBillingCharge(vo);
log.info("定时任务执行，充电中的订单处理结果：{}", JSON.toJSONString(r));
}else{
- //判断充电流水超过15分钟没有更新，则判定为充电结束
+ //判断充电流水超过10分钟没有更新，则判定为充电结束
List<UploadRealTimeMonitoringData> dataList = uploadRealTimeMonitoringDataService.getDataByOrderCode(order.getCode());
if(!dataList.isEmpty()){
UploadRealTimeMonitoringData uploadRealTimeMonitoringData = dataList.get(0);
Date createTime = uploadRealTimeMonitoringData.getCreate_time();
- if(System.currentTimeMillis() - createTime.getTime() - (8 * 60 * 60 * 1000) > 1000 * 60 * 30){
+ if(System.currentTimeMillis() - createTime.getTime() - (8 * 60 * 60 * 1000) > 1000 * 60 * 10){
endOrder(order);
}
}
@@ -293,6 +293,8 @@
@Scheduled(cron = "0 30 0 * * ?")
public void taskMonth() {
if(null != port && port == 5400){
+ //推送三方引流平台数据
+ pushOrderDrainagePlatform();
//添加充电算账单汇总数据
addChargingSettlementBill();
//添加账户结算账单数据
@@ -981,4 +983,21 @@
e.printStackTrace();
}
}
+
+
+ /**
+ * 推送三方引流平台充电数据
+ */
+ public void pushOrderDrainagePlatform(){
+ String format = LocalDateTime.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getStatus, 5)
+ .eq(TChargingOrder::getOrderSource, 2).eq(TChargingOrder::getDelFlag, 0)
+ .isNotNull(TChargingOrder::getStartChargeSeq).isNotNull(TChargingOrder::getOperatorId)
+ .last(" and DATE_FORMAT(end_time, '%Y-%m-%d') = '" + format + "'"));
+ for (TChargingOrder tChargingOrder : list) {
+ String code = tChargingOrder.getCode();
+ chargingOrderService.pushOrderInfo(code);
+ }
+
+ }
}
--
Gitblit v1.7.1