This commit is contained in:
parent
6746ced7e4
commit
9f1628c1d5
1 changed files with 3 additions and 3 deletions
|
|
@ -80,7 +80,7 @@ public class OrderCurrencyTriExportService {
|
||||||
joiner.add("Класс=" + nullSafe(orderCurrency.getMarket()));
|
joiner.add("Класс=" + nullSafe(orderCurrency.getMarket()));
|
||||||
joiner.add("Инструмент=" + nullSafe(orderCurrency.getSecuritySymbol()));
|
joiner.add("Инструмент=" + nullSafe(orderCurrency.getSecuritySymbol()));
|
||||||
joiner.add("Контрагент=" + nullSafe(orderCurrency.getCounterTradingCode()));
|
joiner.add("Контрагент=" + nullSafe(orderCurrency.getCounterTradingCode()));
|
||||||
joiner.add("Цена=" + formatDecimal(orderCurrency.getPrice()));
|
joiner.add("Цена=" + formatDecimalStripZeroes(orderCurrency.getPrice()));
|
||||||
joiner.add("Количество=" + formatDecimal(orderCurrency.getQuantityLot()));
|
joiner.add("Количество=" + formatDecimal(orderCurrency.getQuantityLot()));
|
||||||
joiner.add("Примечание=" + nullSafe(orderCurrency.getAccount()));
|
joiner.add("Примечание=" + nullSafe(orderCurrency.getAccount()));
|
||||||
joiner.add("Ссылка=");
|
joiner.add("Ссылка=");
|
||||||
|
|
@ -122,14 +122,14 @@ public class OrderCurrencyTriExportService {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return formatDecimalRate(rates.getValue());
|
return formatDecimalStripZeroes(rates.getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
private String formatDecimal(BigDecimal value) {
|
private String formatDecimal(BigDecimal value) {
|
||||||
return value == null ? "" : value.toPlainString();
|
return value == null ? "" : value.toPlainString();
|
||||||
}
|
}
|
||||||
|
|
||||||
private String formatDecimalRate(BigDecimal value) {
|
private String formatDecimalStripZeroes(BigDecimal value) {
|
||||||
return value == null ? "" : value.stripTrailingZeros().toPlainString();
|
return value == null ? "" : value.stripTrailingZeros().toPlainString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue