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 c5e0caeb..7212e43b 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 @@ -14,6 +14,7 @@ import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import com.xhpc.pp.utils.HexUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; @@ -51,12 +52,12 @@ public class PileStartChargingDataLogic implements ServiceLogic { String accountOrCardNo = pileStartChargingData.getAccountOrCardNo(); String corpNo = connectorId.substring(0, 6); String balance = "0000"; - String cardNo = "00000000"; + String cardNo = "0000000000000000"; String orderNo = "00000000000000000000000000000000"; if (pileStartChargingData.getStartType().equals("01")) { //刷卡启动 IccardInfoExample example = new IccardInfoExample(); IccardInfoExample.Criteria criteria = example.createCriteria(); - criteria.andCardidEqualTo(accountOrCardNo).andCorpnoEqualTo(corpNo); + criteria.andCardidEqualTo(accountOrCardNo.startsWith("00000000") ? accountOrCardNo.substring(8) : accountOrCardNo).andCorpnoEqualTo(corpNo); List iccardInfos = iccardInfoMapper.selectByExample(example); if (iccardInfos.size() == 1) { IccardInfo iccardInfo = iccardInfos.get(0); @@ -65,10 +66,12 @@ public class PileStartChargingDataLogic implements ServiceLogic { } else { // 调用订单接口 todo orderNo = genOrder(connectorId); + cardNo = iccardInfo.getCardno(); R r = cardService.cardStartup(cardNo, orderNo, pileStartChargingData.getRateModelId().toString()); if (r.getCode() == 200) { result = ServiceResult.HEX_01; } + cardNo = StringUtils.leftPad(iccardInfo.getCardno(), 16, "0"); resultStr = r.getMsg(); } } else { diff --git a/xhpc-modules/xhpc-power-pile/src/main/resources/logback.xml b/xhpc-modules/xhpc-power-pile/src/main/resources/logback.xml index e8528088..efba0cc1 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/resources/logback.xml +++ b/xhpc-modules/xhpc-power-pile/src/main/resources/logback.xml @@ -59,7 +59,8 @@ - + +