From 50747ebcb95dc2ad9fb5daa0419a0633dfb2b999 Mon Sep 17 00:00:00 2001 From: ZZ Date: Thu, 21 Oct 2021 11:24:14 +0800 Subject: [PATCH] =?UTF-8?q?undo=E8=B6=85=E8=BF=87=E4=B8=A4=E5=B0=8F?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=AE=A2=E5=8D=95=E7=BB=93=E7=AE=97=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=A2=E5=BC=83;setCacheObject=C3=97setCacheMap?= =?UTF-8?q?=E2=88=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/pp/logic/OrderDataLogic.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java index 65172d16..7c58e678 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java @@ -52,14 +52,12 @@ public class OrderDataLogic implements ServiceLogic { Map cacheGun = REDIS.getCacheMap(gunkey); cacheGun.put("orderstoptime", cacheOrderData.getEndTime()); cacheGun.put("orderkey", null); - REDIS.setCacheObject(gunkey, cacheGun); + REDIS.setCacheMap(gunkey, cacheGun); Long rdtime = (Long) cacheOrder.get("rdtime"); String resultStr = "6815".concat(req.get("seqhex").toString()).concat("0040").concat(orderNo).concat(ServiceResult.HEX_00); resultStr = resultStr.concat(CRCCalculator.calcCrc(resultStr)); - if (rdtime != null && (DateUtil.calendar().getTimeInMillis() - rdtime) < 3600000) { - pileOrderService.pileEndOrder(orderNo); - } + pileOrderService.pileEndOrder(orderNo); return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK); }