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 { */ List 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 { List 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 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 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 + +