diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index 6252bba1f..96d42e946 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -292,7 +292,7 @@ public abstract class AbstractProgramLogic implements InitializingBean { /** * 处理前端传的参数 * pileConnectorCode = pileSn + connectorCode - * + * 2024年3月11日14点04分修改,使用OrderBasicInfoService中的公共方法 * @param dto */ // protected void analysisPileParameter(BasicPileDTO dto) { @@ -315,48 +315,48 @@ public abstract class AbstractProgramLogic implements InitializingBean { /** * 校验充电桩相关的信息 - * + * 2024年3月11日14点04分修改,使用OrderBasicInfoService中的公共方法 * @param dto */ - /*protected void checkPileInfo(GenerateOrderDTO dto) { - // 查询充电桩状态 是否空闲 枪口是否占用 - PileConnectorDetailVO pileConnector = pileBasicInfoService.queryPileConnectorDetail(dto.getPileSn() + dto.getConnectorCode()); - if (pileConnector == null) { - logger.error("checkPileInfo充电枪口为空 pileSn:{}, connectorCode:{}", dto.getPileSn(), dto.getConnectorCode()); - throw new BusinessException(ReturnCodeEnum.CODE_CONNECTOR_INFO_NULL_ERROR); - } - - // 查询站点状态 - PileStationVO stationInfo = pileStationInfoService.getStationInfo(pileConnector.getStationId()); - if (stationInfo == null || StringUtils.equals(stationInfo.getOpenFlag(), Constants.ZERO)) { - throw new BusinessException(ReturnCodeEnum.CODE_STATION_IS_NOT_OPEN); - } - - // 校验启动桩使用的小程序,和充电桩所属一级运营商是否一致 - String merchantIdByAppId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(dto.getAppId()); - String merchantIdByMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(stationInfo.getMerchantId()); - if (!StringUtils.equals(merchantIdByAppId, merchantIdByMerchantId)) { - throw new BusinessException("", "当前桩运营商与小程序所属运营商不一致"); - } - - // 如果是鉴权卡或者vin启动,不判断枪口状态 - if (!(StringUtils.equals(dto.getStartMode(), StartModeEnum.AUTH_CARD.getValue()) - || StringUtils.equals(dto.getStartMode(), StartModeEnum.VIN_CODE.getValue()))) { - // 判断枪口状态 - if (!(StringUtils.equals(pileConnector.getConnectorStatus(), PileConnectorDataBaseStatusEnum.FREE.getValue()) - || StringUtils.equals(pileConnector.getConnectorStatus(), PileConnectorDataBaseStatusEnum.OCCUPIED_NOT_CHARGED.getValue()))) { - logger.error("checkPileInfo充电枪口状态不正确,当前状态为:{}", pileConnector.getConnectorStatus()); - throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR); - } - } - // 查询充电桩的计费模板 - BillingTemplateVO billingTemplateVO = pileBillingTemplateService.selectBillingTemplateDetailByPileSn(dto.getPileSn()); - if (billingTemplateVO == null) { - throw new BusinessException(ReturnCodeEnum.CODE_BILLING_TEMPLATE_NULL_ERROR); - } - dto.setPileConnector(pileConnector); - dto.setBillingTemplate(billingTemplateVO); - }*/ + // protected void checkPileInfo(GenerateOrderDTO dto) { + // // 查询充电桩状态 是否空闲 枪口是否占用 + // PileConnectorDetailVO pileConnector = pileBasicInfoService.queryPileConnectorDetail(dto.getPileSn() + dto.getConnectorCode()); + // if (pileConnector == null) { + // logger.error("checkPileInfo充电枪口为空 pileSn:{}, connectorCode:{}", dto.getPileSn(), dto.getConnectorCode()); + // throw new BusinessException(ReturnCodeEnum.CODE_CONNECTOR_INFO_NULL_ERROR); + // } + // + // // 查询站点状态 + // PileStationVO stationInfo = pileStationInfoService.getStationInfo(pileConnector.getStationId()); + // if (stationInfo == null || StringUtils.equals(stationInfo.getOpenFlag(), Constants.ZERO)) { + // throw new BusinessException(ReturnCodeEnum.CODE_STATION_IS_NOT_OPEN); + // } + // + // // 校验启动桩使用的小程序,和充电桩所属一级运营商是否一致 + // String merchantIdByAppId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(dto.getAppId()); + // String merchantIdByMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(stationInfo.getMerchantId()); + // if (!StringUtils.equals(merchantIdByAppId, merchantIdByMerchantId)) { + // throw new BusinessException("", "当前桩运营商与小程序所属运营商不一致"); + // } + // + // // 如果是鉴权卡或者vin启动,不判断枪口状态 + // if (!(StringUtils.equals(dto.getStartMode(), StartModeEnum.AUTH_CARD.getValue()) + // || StringUtils.equals(dto.getStartMode(), StartModeEnum.VIN_CODE.getValue()))) { + // // 判断枪口状态 + // if (!(StringUtils.equals(pileConnector.getConnectorStatus(), PileConnectorDataBaseStatusEnum.FREE.getValue()) + // || StringUtils.equals(pileConnector.getConnectorStatus(), PileConnectorDataBaseStatusEnum.OCCUPIED_NOT_CHARGED.getValue()))) { + // logger.error("checkPileInfo充电枪口状态不正确,当前状态为:{}", pileConnector.getConnectorStatus()); + // throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR); + // } + // } + // // 查询充电桩的计费模板 + // BillingTemplateVO billingTemplateVO = pileBillingTemplateService.selectBillingTemplateDetailByPileSn(dto.getPileSn()); + // if (billingTemplateVO == null) { + // throw new BusinessException(ReturnCodeEnum.CODE_BILLING_TEMPLATE_NULL_ERROR); + // } + // dto.setPileConnector(pileConnector); + // dto.setBillingTemplate(billingTemplateVO); + // } @@ -728,7 +728,7 @@ public abstract class AbstractProgramLogic implements InitializingBean { /** * 保存订单信息到数据库 - * + * 2024年3月11日14点04分修改,使用OrderBasicInfoService中的公共方法 * @param dto * @return */