Merge branch 'dev-zza' into dev

This commit is contained in:
Lemon
2025-03-27 10:01:33 +08:00

View File

@@ -721,8 +721,8 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
if (StringUtils.equals(Constants.ONE, sortType)) { if (StringUtils.equals(Constants.ONE, sortType)) {
// 低价优先 // 低价优先
stationVOList.sort((x1, x2) -> { stationVOList.sort((x1, x2) -> {
Double a = Double.valueOf(x1.getTotalPrice()); Double a = Double.valueOf(x1.getTotalPrice() == null ? "0" : x1.getTotalPrice());
Double b = Double.valueOf(x2.getTotalPrice()); Double b = Double.valueOf(x2.getTotalPrice() == null ? "0" : x2.getTotalPrice());
return a.compareTo(b); return a.compareTo(b);
}); });
} else if (distance != 0.00) { } else if (distance != 0.00) {