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); }