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