Quellcode durchsuchen

#FIX 设备管理费明细

tanbin vor 1 Jahr
Ursprung
Commit
78ccacd2f7

+ 5 - 0
device-api-service/src/main/java/com/xy/service/DeviceChargingHistoryServiceImpl.java

@@ -149,6 +149,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
                 Long deviceId = record.getDeviceId();
                 //初始0 代理商费用
                 record.setAgentMoney(0);
+                Integer chargingMoney = record.getChargingMoney();
                 DeviceInfoDto.Vo device = devcieMap.get(deviceId);
                 if (device != null) {
                     Integer deviceType = device.getDeviceType();
@@ -156,6 +157,10 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
                         DeviceChargingConfigDto.DeviceManagerFeeMercVO deviceManagerFeeMercVO = dfmMap.get(deviceType);
                         Integer extraMoney = deviceManagerFeeMercVO.getExtraMoney();
                         //反显代理商金额
+                        if (chargingMoney != null && extraMoney > chargingMoney) {
+                            //扩展金额比实缴金额还大?
+                            extraMoney = 0;
+                        }
                         record.setAgentMoney(extraMoney);
                     }
                 }