diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java index c887c639..b755605e 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java @@ -634,6 +634,7 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar } @Override + @Transactional public R cardStartup(Long userId, String serialNumber, Integer userType, String tenantId, Integer type, String grantOperator, String rateModelId) { @@ -665,7 +666,7 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar } if (type != 0) { //获取桩信息 - if (grantOperator.equals(xhpcChargingPileById.get("corpNo").toString())) { + if (!grantOperator.equals(xhpcChargingPileById.get("corpNo").toString())) { return R.fail(Constants.INVALID_OPERATOR); } } 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 48764509..b4067e72 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 @@ -25,6 +25,8 @@ import javax.annotation.Resource; import java.util.List; import java.util.Map; +import static com.xhpc.common.data.redis.StaticBeanUtil.seqHex; + @Lazy @Component("PileStartChargingDataLogic") public class PileStartChargingDataLogic implements ServiceLogic { @@ -56,7 +58,7 @@ 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); + criteria.andCardidEqualTo(accountOrCardNo.startsWith("00000000") ? accountOrCardNo.substring(8) : accountOrCardNo).andCorpnoEqualTo(corpNo); // todo remove corpNo List iccardInfos = iccardInfoMapper.selectByExample(example); if (iccardInfos.size() == 1) { IccardInfo iccardInfo = iccardInfos.get(0); @@ -78,7 +80,9 @@ public class PileStartChargingDataLogic implements ServiceLogic { resultStr = "01"; } } - String hex = orderNo.concat(connectorId).concat(cardNo).concat(balance).concat(result).concat(resultStr); + String skey = "gun:".concat(connectorId).concat(".seqhex"); + String hex = + "682A".concat(seqHex(skey)).concat("0032").concat(orderNo).concat(connectorId).concat(cardNo).concat(balance).concat(result).concat(resultStr); hex = hex.concat(CRCCalculator.calcCrc(hex)); String remark = "充电桩发起充电"; XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();