diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java index 29424df26..a5c2f20da 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java @@ -694,10 +694,10 @@ public class CommonService { LocalTime createLocalTime = DateUtils.date2LocalDateTime(orderBasicInfo.getCreateTime()).toLocalTime(); LocalTime startTime = chargeParkingDiscount.getStartTime(); LocalTime endTime = chargeParkingDiscount.getEndTime(); - log.info("站点:{}绑定停车券, 订单号:{}, 门槛类型:{}, 门槛值:{}, 优惠时间段:{}, 充电度数:{}, 充电时长:{}, 订单创建时间:{}", - orderBasicInfo.getStationId(), orderBasicInfo.getOrderCode(), conditionType, chargeParkingDiscount.getConditionValue(), - startTime.toString() + endTime.toString(), chargingDegree, sumChargingTime, DateUtils.formatDateTime(orderBasicInfo.getCreateTime())); - // startTime等于endTime,shuo则不需要判断, 如果startTime不等于endTime,则需要判断订单创建时间是否在优惠时间段内 + log.info("站点:{}绑定停车券, 订单号:{}, 充电停车优惠信息:{}, 充电度数:{}, 充电时长:{}, 订单创建时间:{}", + orderBasicInfo.getStationId(), orderBasicInfo.getOrderCode(), JSON.toJSONString(chargeParkingDiscount), + chargingDegree, sumChargingTime, DateUtils.formatDateTime(orderBasicInfo.getCreateTime())); + // startTime等于endTime,则不需要判断, 如果startTime不等于endTime,则需要判断订单创建时间是否在优惠时间段内 if (!StringUtils.equals(startTime.toString(), endTime.toString())) { if (createLocalTime.isBefore(startTime) || createLocalTime.isAfter(endTime)) { // 不在优惠时间段内 @@ -733,26 +733,25 @@ public class CommonService { return; } // 绑定停车券 - PileStationVO stationInfo = pileStationInfoService.getStationInfo(orderBasicInfo.getStationId()); + // PileStationVO stationInfo = pileStationInfoService.getStationInfo(orderBasicInfo.getStationId()); + String parkingPlatformId = chargeParkingDiscount.getParkingPlatformId() + ""; boolean discountFlag = false; - if (StringUtils.equals(ParkingPlatformEnum.LU_TONG_YUN_TING_PLATFORM.getCode(), stationInfo.getParkingId())) { - if (StringUtils.equals(ParkingPlatformEnum.LU_TONG_YUN_TING_PLATFORM.getCode(), stationInfo.getParkingId())) { - // 路通云停 - BindCouponDTO dto = BindCouponDTO.builder() - .plateNumber(orderBasicInfo.getPlateNumber()) - .orderBasicInfo(orderBasicInfo) - .build(); - // 绑定优惠券 - String s = ltytService.bindCoupon(dto); - // 如果s为ok, discountFlag为true - discountFlag = StringUtils.equals(s, "ok"); - } - } else if (StringUtils.equals(ParkingPlatformEnum.SHEN_ZHEN_PLATFORM.getCode(), stationInfo.getParkingId())) { + if (StringUtils.equals(ParkingPlatformEnum.LU_TONG_YUN_TING_PLATFORM.getCode(), parkingPlatformId)) { + // 路通云停 + BindCouponDTO dto = BindCouponDTO.builder() + .plateNumber(orderBasicInfo.getPlateNumber()) + .orderBasicInfo(orderBasicInfo) + .build(); + // 绑定优惠券 + String s = ltytService.bindCoupon(dto); + // 如果s为ok, discountFlag为true + discountFlag = StringUtils.equals(s, "ok"); + } else if (StringUtils.equals(ParkingPlatformEnum.SHEN_ZHEN_PLATFORM.getCode(), parkingPlatformId)) { // 深圳道闸 QcyunParkCouponDTO dto = QcyunParkCouponDTO.builder() .plateNumber(orderBasicInfo.getPlateNumber()) .stationId(orderBasicInfo.getStationId()) - .stationName(stationInfo.getStationName()) + .stationName("深圳停车场") .build(); discountFlag = qcyunsService.issuanceOfParkingTickets(dto); }