From 082b9ab8643bc5e81f2e70b8e9400fdaba62e686 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 03 九月 2025 17:19:18 +0800
Subject: [PATCH] 修改小程序首页查询重复bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 01740da..bc4d15a 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
@@ -52,7 +52,6 @@
import com.ruoyi.order.service.TChargingOrderService;
import com.ruoyi.order.service.TOrderEvaluateService;
import com.ruoyi.order.service.*;
-import com.ruoyi.order.util.RedisLock;
import com.ruoyi.order.util.mongodb.service.PlatformStartChargingReplyService;
import com.ruoyi.order.util.mongodb.service.TransactionRecordService;
import com.ruoyi.order.util.mongodb.service.UploadRealTimeMonitoringDataService;
@@ -1826,9 +1825,7 @@
dto.setSiteIds(siteIds);
PageInfo<ChargingOrderListVO> pageInfo = new PageInfo<>(dto.getPageCurr(), dto.getPageSize());
List<ChargingOrderListVO> list = this.baseMapper.chargingList(pageInfo, dto, startTime1, startTime2, endTime1, endTime2);
- List<Integer> siteIdsList = list.stream().map(ChargingOrderListVO::getSiteId).collect(Collectors.toList());
- if (siteIdsList.isEmpty()) siteIdsList.add(-1);
- List<Site> sites = siteClient.getSiteByIds(siteIdsList).getData();
+ List<Site> sites = siteClient.getSiteAll().getData();
for (ChargingOrderListVO chargingOrderListVO : list) {
if (roleType == 2) {
@@ -2542,10 +2539,10 @@
Integer soc = uploadRealTimeMonitoringData.getSoc();
if (soc >= 98) {
chargingOrder.setEndMode(2);
- } else if (chargingOrder.getResidualAmount().compareTo(new BigDecimal(1)) <= 0) {
+ } else if (null != chargingOrder.getResidualAmount() && chargingOrder.getResidualAmount().compareTo(new BigDecimal(1)) <= 0) {
chargingOrder.setEndMode(3);
} else {
- chargingOrder.setEndMode(0);
+ chargingOrder.setEndMode(1);
}
}
chargingOrder.setResidualAmount(rechargeAmount.subtract(total).setScale(2, RoundingMode.HALF_EVEN));
@@ -4221,9 +4218,9 @@
@Override
public R pushOrderInfo(String code) {
TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, code));
- tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
- tcecClient.notificationStopChargeResult(chargingOrder.getStartChargeSeq(), chargingOrder.getChargingGunId().toString(),
- chargingOrder.getOperatorId());
+// tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+// tcecClient.notificationStopChargeResult(chargingOrder.getStartChargeSeq(), chargingOrder.getChargingGunId().toString(),
+// chargingOrder.getOperatorId());
tcecClient.notificationChargeOrderInfo(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
return R.ok();
}
@@ -4327,9 +4324,10 @@
}
@Override
- public BigDecimal getSumDegreeBySiteIds(List<Integer> siteIds) {
-
- return this.baseMapper.getSumDegreeBySiteIds(siteIds);
+ public Double getSumDegreeBySiteIds(List<Integer> siteIds) {
+ Double sumDegreeBySiteIds = this.baseMapper.getSumDegreeBySiteIds(siteIds);
+
+ return sumDegreeBySiteIds;
}
--
Gitblit v1.7.1