diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChargeAlgorithmService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChargeAlgorithmService.java index 8afc5e4f3..52571be8c 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChargeAlgorithmService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChargeAlgorithmService.java @@ -17,6 +17,7 @@ import com.jsowell.pile.service.PileBasicInfoService; import com.jsowell.pile.service.PileStationInfoService; import com.jsowell.pile.thirdparty.ParameterConfigData; import com.jsowell.pile.vo.uniapp.customer.OrderVO; +import com.jsowell.pile.vo.web.PileDetailVO; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.thirdparty.platform.domain.ChargeAlgorithmData; import org.slf4j.Logger; @@ -72,6 +73,13 @@ public class ChargeAlgorithmService { if (orderVO == null) { return "订单信息为空"; } + // 先判断直流桩还是交流桩,如果是交流桩就不进行计算 + PileDetailVO pileDetailVO = pileBasicInfoService.selectPileDetailByPileSn(orderVO.getPileSn()); + if (StringUtils.equals(Constants.TWO, pileDetailVO.getChargePortType())) { + log.info("订单:{} 为交流桩订单,不进行充电算法计算", orderCode); + return "不进行计算"; + } + // 查询站点信息 PileStationVO stationVO = pileStationInfoService.getStationInfo(orderVO.getStationId());