From 0441587c7bb6d0910a81a5908501a091bd02015a Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Thu, 18 Sep 2025 23:47:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=A0=B9=E6=8D=AE=E7=A7=9F?=
 =?UTF-8?q?=E7=94=B5=E5=A5=97=E9=A4=90=E6=9F=A5=E8=AF=A2=E7=94=B5=E6=B1=A0?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sczx/car/mapper/RentBatteyRuleMapper.java    |  7 +++++++
 .../com/sczx/car/repository/RentBatteyRuleRepo.java  |  1 +
 .../car/repository/impl/RentBatteyRuleRepoImpl.java  |  5 +++++
 .../car/service/impl/RentBatteyRuleServiceImpl.java  | 12 ++----------
 src/main/resources/mapper/RentBatteyRuleMapper.xml   | 12 ++++++++++++
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/sczx/car/mapper/RentBatteyRuleMapper.java b/src/main/java/com/sczx/car/mapper/RentBatteyRuleMapper.java
index d0308dd..6c64156 100644
--- a/src/main/java/com/sczx/car/mapper/RentBatteyRuleMapper.java
+++ b/src/main/java/com/sczx/car/mapper/RentBatteyRuleMapper.java
@@ -24,4 +24,11 @@ public interface RentBatteyRuleMapper extends BaseMapper<RentBatteyRulePO> {
      */
     List<RentBatteyRuleDTO> queryRentBatteyRuleByCarRuleId(@Param("carRuleId") Integer carRuleId);
 
+    /**
+     * 根据 id 查询 租电套餐计费规则
+     * @param id
+     * @return
+     */
+    RentBatteyRuleDTO getRentBatteyRuleById(@Param("id") Integer id);
+
 }
diff --git a/src/main/java/com/sczx/car/repository/RentBatteyRuleRepo.java b/src/main/java/com/sczx/car/repository/RentBatteyRuleRepo.java
index 32012b8..18b1aa9 100644
--- a/src/main/java/com/sczx/car/repository/RentBatteyRuleRepo.java
+++ b/src/main/java/com/sczx/car/repository/RentBatteyRuleRepo.java
@@ -16,4 +16,5 @@ import java.util.List;
  */
 public interface RentBatteyRuleRepo extends IService<RentBatteyRulePO> {
     List<RentBatteyRuleDTO> queryRentBatteyRuleByCarRuleId(Integer carRuleId);
+    RentBatteyRuleDTO getRentBatteyRuleById(Integer id);
 }
diff --git a/src/main/java/com/sczx/car/repository/impl/RentBatteyRuleRepoImpl.java b/src/main/java/com/sczx/car/repository/impl/RentBatteyRuleRepoImpl.java
index 1a85302..efd5738 100644
--- a/src/main/java/com/sczx/car/repository/impl/RentBatteyRuleRepoImpl.java
+++ b/src/main/java/com/sczx/car/repository/impl/RentBatteyRuleRepoImpl.java
@@ -24,4 +24,9 @@ public class RentBatteyRuleRepoImpl extends ServiceImpl<RentBatteyRuleMapper, Re
     public List<RentBatteyRuleDTO> queryRentBatteyRuleByCarRuleId(Integer carRuleId) {
         return this.getBaseMapper().queryRentBatteyRuleByCarRuleId(carRuleId);
     }
+
+    @Override
+    public RentBatteyRuleDTO getRentBatteyRuleById(Integer id) {
+        return this.getBaseMapper().getRentBatteyRuleById(id);
+    }
 }
diff --git a/src/main/java/com/sczx/car/service/impl/RentBatteyRuleServiceImpl.java b/src/main/java/com/sczx/car/service/impl/RentBatteyRuleServiceImpl.java
index e96d34c..6d8f027 100644
--- a/src/main/java/com/sczx/car/service/impl/RentBatteyRuleServiceImpl.java
+++ b/src/main/java/com/sczx/car/service/impl/RentBatteyRuleServiceImpl.java
@@ -6,9 +6,6 @@ import com.sczx.car.service.RentBatteyRuleService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
 
 @Slf4j
 @Service
@@ -18,12 +15,7 @@ public class RentBatteyRuleServiceImpl implements RentBatteyRuleService {
     private RentBatteyRuleRepo rentBatteyRuleRepo;
 
     @Override
-    public RentBatteyRuleDTO getRentBatteyRuleByBatteyRuleId(Long carRuleId) {
-//        RentBatteyRulePO rentBatteyRulePO = rentBatteyRuleRepo.getById(carRuleId);
-        List<RentBatteyRuleDTO> rentBatteyRuleList = rentBatteyRuleRepo.queryRentBatteyRuleByCarRuleId(carRuleId.intValue());
-        if(CollectionUtils.isEmpty(rentBatteyRuleList)){
-            return null;
-        }
-        return rentBatteyRuleList.get(0);
+    public RentBatteyRuleDTO getRentBatteyRuleByBatteyRuleId(Long batteyRuleId) {
+        return rentBatteyRuleRepo.getRentBatteyRuleById(batteyRuleId.intValue());
     }
 }
diff --git a/src/main/resources/mapper/RentBatteyRuleMapper.xml b/src/main/resources/mapper/RentBatteyRuleMapper.xml
index b1b5bc3..72755a1 100644
--- a/src/main/resources/mapper/RentBatteyRuleMapper.xml
+++ b/src/main/resources/mapper/RentBatteyRuleMapper.xml
@@ -15,4 +15,16 @@
         rcb.car_rule_id = #{carRuleId}
         AND b.is_delete = 0
     </select>
+
+    <select id="getRentBatteyRuleById" resultType="com.sczx.car.dto.RentBatteyRuleDTO">
+        SELECT
+        b.*,c.category_name
+        FROM
+        zc_rent_battey_rule b
+        JOIN
+        zc_battery_category c ON b.category_id = c.id
+        WHERE
+        b.id = #{id}
+        AND b.is_delete = 0
+    </select>
 </mapper>