diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTimingChargingModelServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTimingChargingModelServiceImpl.java index ccf69fd5..7de6ce29 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTimingChargingModelServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTimingChargingModelServiceImpl.java @@ -449,6 +449,8 @@ public class XhpcTimingChargingModelServiceImpl extends BaseService implements I TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return R.fail("费率查询为空"); } + //添加费率 + Map map = new HashMap<>(); for (int j = 0; j < timingChargingRate.size(); j++) { XhpcTimingChargingRate xhpcTimingChargingRate = timingChargingRate.get(j); XhpcRate xhpcRate = new XhpcRate(); @@ -460,6 +462,7 @@ public class XhpcTimingChargingModelServiceImpl extends BaseService implements I xhpcRate.setRateValue(xhpcTimingChargingRate.getRateValue()); xhpcRate.setTenantId(xhpcTimingChargingRate.getTenantId()); xhpcChargingStationService.insertXhpcRate(xhpcRate); + map.put(xhpcTimingChargingRate.getRateValue(), xhpcRate.getRateId()); } //添加费率时段 List timingChargingTime = xhpcTimingChargingModelMapper.getTimeTimingChargingModelId(timingChargingModelId); @@ -471,12 +474,13 @@ public class XhpcTimingChargingModelServiceImpl extends BaseService implements I XhpcTimingChargingTime xhpcTimingChargingTime = timingChargingTime.get(j); XhpcRateTime xhpcRateTime = new XhpcRateTime(); xhpcRateTime.setChargingStationId(chargingStationId); - xhpcRateTime.setRateId(xhpcTimingChargingTime.getTimingChargingRateId()); xhpcRateTime.setStartTime(xhpcTimingChargingTime.getStartTime()); xhpcRateTime.setEndTime(xhpcTimingChargingTime.getEndTime()); xhpcRateTime.setRateModelId(rateModelId); xhpcRateTime.setSort(xhpcTimingChargingTime.getSort()); xhpcRateTime.setType(xhpcTimingChargingTime.getType()); + Long rateId = map.get(xhpcTimingChargingTime.getRateValue()); + xhpcRateTime.setRateId(rateId); xhpcRateTime.setRateValue(xhpcTimingChargingTime.getRateValue()); xhpcRateTime.setCreateTime(Calendar.getInstance().getTime()); xhpcChargingStationService.insertXhpcRateTime(xhpcRateTime);