From 1d2df8d0f7b692d60f4e65f7431669cec1ef02a1 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Mon, 28 Feb 2022 09:27:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E8=AE=A1?=
 =?UTF-8?q?=E8=B4=B9=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../station/service/XhpcTimingChargingModelServiceImpl.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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<String, Long> 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<XhpcTimingChargingTime> 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);