From a3981c68024dd9d263d88c9b5b211c711df89883 Mon Sep 17 00:00:00 2001 From: ZZ Date: Tue, 1 Mar 2022 11:10:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E5=8D=A1=E5=90=AF=E5=8A=A8=E5=85=BC?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/pp/logic/PileStartChargingDataLogic.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java index 06a64110..1803451c 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java @@ -63,7 +63,15 @@ public class PileStartChargingDataLogic implements ServiceLogic { if (pileStartChargingData.getStartType().equals("01")) { //刷卡启动 IccardInfoExample example = new IccardInfoExample(); IccardInfoExample.Criteria criteria = example.createCriteria(); - criteria.andCardidEqualTo(accountOrCardNo.startsWith("00000000") ? accountOrCardNo.substring(8) : accountOrCardNo).andCorpnoEqualTo(corpNo); // todo remove corpNo + String pyhsicCardNo = null; + if (accountOrCardNo.startsWith("00000000")) { + pyhsicCardNo = accountOrCardNo.substring(8); + } else if (accountOrCardNo.endsWith("00000000")) { + pyhsicCardNo = accountOrCardNo.substring(0, 8); + } else { + pyhsicCardNo = accountOrCardNo; + } + criteria.andCardidEqualTo(pyhsicCardNo).andCorpnoEqualTo(corpNo); // todo remove corpNo List iccardInfos = iccardInfoMapper.selectByExample(example); if (iccardInfos.size() == 1) { IccardInfo iccardInfo = iccardInfos.get(0); @@ -101,7 +109,7 @@ public class PileStartChargingDataLogic implements ServiceLogic { } else { String internalError = r.getMsg(); if (internalError.startsWith("0") || internalError.startsWith("1")) { - resultStr = internalError; + result = internalError; } else { log.error(internalError); }