From fbc97a0cd98d7a4c93d94c0b91f3ed2ec0bd5a78 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 10 Dec 2025 11:13:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=85=85=E7=94=B5=E5=90=AF=E5=8A=A8=E7=8A=B6=E6=80=81=E7=BC=93?= =?UTF-8?q?=E5=AD=98=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=90=AF=E5=8A=A8=E5=85=85?= =?UTF-8?q?=E7=94=B5=E7=BB=93=E6=9E=9C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/service/OrderService.java | 14 +++++++++++--- .../jsowell/common/constant/CacheConstants.java | 5 +++++ .../main/java/com/jsowell/common/util/ZipUtil.java | 3 ++- .../service/impl/OrderBasicInfoServiceImpl.java | 5 +++++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index b241d8d41..e7db09e12 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -709,9 +709,17 @@ public class OrderService { reason = orderInfo.getReason(); } else { // 查询订单的实时监测数据 - List chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderInfo.getTransactionCode()); - if (CollectionUtils.isNotEmpty(chargingRealTimeData)) { - // 实时监测数据不为空说明已经在充电中了 + // List chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderInfo.getTransactionCode()); + // if (CollectionUtils.isNotEmpty(chargingRealTimeData)) { + // // 实时监测数据不为空说明已经在充电中了 + // status = Constants.ONE; + // } + + // 查询缓存中该笔订单的启动状态 + String redisKey = CacheConstants.QUERY_ORDER_START_RESULT_BY_ORDER_CODE + orderCode; + String startResult = (String) redisCache.getCacheObject(redisKey); + if (StringUtils.equals(Constants.ONE, startResult)) { + // 启动成功 status = Constants.ONE; } } diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java index fb27f89d3..fbe897279 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java @@ -170,6 +170,11 @@ public class CacheConstants { */ public static final String SELECT_PILE_CONNECTOR_INFO_LIST = "select_pile_connector_info_list:"; + /** + * 查询订单启动结果 + */ + public static final String QUERY_ORDER_START_RESULT_BY_ORDER_CODE = "query_order_start_result_by_order_code:"; + /** * 0x3b交易记录缓存key */ diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java b/jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java index 6525ad366..fbed1e63d 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/ZipUtil.java @@ -19,7 +19,8 @@ public class ZipUtil { } String fileName = "images-" + System.currentTimeMillis() + ".zip"; File zipFile = new File(fileName); - try (FileOutputStream fos = new FileOutputStream(zipFile); ZipOutputStream zos = new ZipOutputStream(fos)) { + try (FileOutputStream fos = new FileOutputStream(zipFile); + ZipOutputStream zos = new ZipOutputStream(fos)) { for (int i = 0; i < imageUrls.size(); i++) { String imageUrl = imageUrls.get(i); URL url = new URL(imageUrl); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 30617e53b..b8231af02 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -671,6 +671,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { orderInfo.setChargeStartTime(new Date()); } updateOrderBasicInfo(orderInfo); + + // 添加一条启动成功的缓存 + String redisKey = CacheConstants.QUERY_ORDER_START_RESULT_BY_ORDER_CODE + orderInfo.getOrderCode(); + redisCache.setCacheObject(redisKey, Constants.ONE, 10, TimeUnit.MINUTES); + // // 判断是否要向小程序发送通知 // if (StringUtils.isNotEmpty(orderInfo.getMemberId())){ // // 发送小程序通知