Bladeren bron

fix(service): 修正计算可用充电金额接口参数类型

- 将 calculateAvailableChargingAmount 方法参数由 Long 类型改为 String 类型
- 查询充电接口信息时根据 connectorCode 进行查询替代之前的 connectorId 查询
- 修改日志打印中对应参数名称及内容为 connectorCode
- 引入 Wrappers 以支持 lambdaQuery 条件构造器使用
- 更新方法注释及相关参数说明针对 connectorCode 进行描述
SheepHy 1 week geleden
bovenliggende
commit
34cecb2dad

+ 2 - 2
src/main/java/com/zsElectric/boot/business/service/AppletHomeService.java

@@ -90,9 +90,9 @@ public interface AppletHomeService {
      * 4. 可用余额 = 余额 - 安全价 - 运营费总额 - 增值费用总额
      * 注意:需要处理跨时段情况,不同时段价格不同,需要分段计算
      *
-     * @param connectorId 充电设备接口ID
+     * @param connectorCode 充电设备接口
      * @return 可用充电金额(元)
      */
-    BigDecimal calculateAvailableChargingAmount(Long connectorId);
+    BigDecimal calculateAvailableChargingAmount(String connectorCode);
 
 }

+ 6 - 4
src/main/java/com/zsElectric/boot/business/service/impl/AppletHomeServiceImpl.java

@@ -2,6 +2,7 @@ package com.zsElectric.boot.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zsElectric.boot.business.converter.BannerInfoConverter;
 import com.zsElectric.boot.business.mapper.*;
@@ -759,7 +760,7 @@ public class AppletHomeServiceImpl implements AppletHomeService {
     }
 
     @Override
-    public BigDecimal calculateAvailableChargingAmount(Long connectorId) {
+    public BigDecimal calculateAvailableChargingAmount(String connectorCode) {
         // 获取当前登录用户ID
         Long userId = SecurityUtils.getUserId();
         if (userId == null) {
@@ -798,9 +799,10 @@ public class AppletHomeServiceImpl implements AppletHomeService {
         }
 
         // 3. 查询充电接口、设备、站点信息
-        ThirdPartyConnectorInfo connectorInfo = thirdPartyConnectorInfoMapper.selectById(connectorId);
+        ThirdPartyConnectorInfo connectorInfo = thirdPartyConnectorInfoMapper.selectOne(Wrappers.<ThirdPartyConnectorInfo>lambdaQuery()
+                .eq(ThirdPartyConnectorInfo::getConnectorId,connectorCode).last("LIMIT 1"));
         if (connectorInfo == null) {
-            log.warn("充电接口不存在 - connectorId: {}", connectorId);
+            log.warn("充电接口不存在 - connectorId: {}", connectorCode);
             return BigDecimal.ZERO;
         }
 
@@ -973,7 +975,7 @@ public class AppletHomeServiceImpl implements AppletHomeService {
 
         log.info("可用充电金额计算完成 - userId: {}, connectorId: {}, userBalance: {}, safetyFee: {}, " +
                         "totalOpFeeCost: {}, totalValueAddedCost: {}, availableAmount: {}",
-                userId, connectorId, userBalance, safetyFee, totalOpFeeCost, totalValueAddedCost, availableAmount);
+                userId, connectorCode, userBalance, safetyFee, totalOpFeeCost, totalValueAddedCost, availableAmount);
 
         return availableAmount;
     }