java 버전 맞춤
This commit is contained in:
parent
73da60a017
commit
9b7620637e
@ -1986,7 +1986,7 @@ public class EstimateService {
|
|||||||
|
|
||||||
if ("YJSS".equals(estimateType)) {
|
if ("YJSS".equals(estimateType)) {
|
||||||
pkgTotPrice = pkgAsp.multiply(totVol);
|
pkgTotPrice = pkgAsp.multiply(totVol);
|
||||||
pkgTotPrice = pkgTotPrice.setScale(0, BigDecimal.ROUND_HALF_UP);
|
pkgTotPrice = pkgTotPrice.setScale(0, RoundingMode.HALF_UP);
|
||||||
supplyPrice = supplyPrice.add(pkgTotPrice);
|
supplyPrice = supplyPrice.add(pkgTotPrice);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1996,14 +1996,14 @@ public class EstimateService {
|
|||||||
totPrice = totPrice.add(supplyPrice.add(vatPrice));
|
totPrice = totPrice.add(supplyPrice.add(vatPrice));
|
||||||
|
|
||||||
estimateResponse.setPkgTotPrice(String.valueOf(pkgTotPrice));
|
estimateResponse.setPkgTotPrice(String.valueOf(pkgTotPrice));
|
||||||
estimateResponse.setTotAmount(String.valueOf(totAmount.setScale(0, BigDecimal.ROUND_HALF_UP)));
|
estimateResponse.setTotAmount(String.valueOf(totAmount.setScale(0, RoundingMode.HALF_UP)));
|
||||||
estimateResponse.setTotVol(String.valueOf(totVol));
|
estimateResponse.setTotVol(String.valueOf(totVol));
|
||||||
estimateResponse.setTotVolKw(String
|
estimateResponse.setTotVolKw(String
|
||||||
.valueOf(totVol.multiply(new BigDecimal("0.001")).setScale(3, BigDecimal.ROUND_FLOOR)));
|
.valueOf(totVol.multiply(new BigDecimal("0.001")).setScale(3, RoundingMode.FLOOR)));
|
||||||
estimateResponse
|
estimateResponse
|
||||||
.setSupplyPrice(String.valueOf(supplyPrice.setScale(0, BigDecimal.ROUND_HALF_UP)));
|
.setSupplyPrice(String.valueOf(supplyPrice.setScale(0, RoundingMode.HALF_UP)));
|
||||||
estimateResponse.setVatPrice(String.valueOf(vatPrice.setScale(0, BigDecimal.ROUND_HALF_UP)));
|
estimateResponse.setVatPrice(String.valueOf(vatPrice.setScale(0, RoundingMode.HALF_UP)));
|
||||||
estimateResponse.setTotPrice(String.valueOf(totPrice.setScale(0, BigDecimal.ROUND_HALF_UP)));
|
estimateResponse.setTotPrice(String.valueOf(totPrice.setScale(0, RoundingMode.HALF_UP)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final Set<String> EXCEL_ITEM_NUMBER_FIELDS = new HashSet<>(
|
private static final Set<String> EXCEL_ITEM_NUMBER_FIELDS = new HashSet<>(
|
||||||
@ -2313,9 +2313,11 @@ public class EstimateService {
|
|||||||
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||||
response = om.readValue(strResponse, EstimateApiResponse.class);
|
response = om.readValue(strResponse, EstimateApiResponse.class);
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
Map<String, Object> result = (Map<String, Object>) response.getData();
|
Map<String, Object> result = (Map<String, Object>) response.getData();
|
||||||
|
|
||||||
if (result != null) {
|
if (result != null) {
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
List<Map<String, Object>> succList =
|
List<Map<String, Object>> succList =
|
||||||
(List<Map<String, Object>>) result.get("successList");
|
(List<Map<String, Object>>) result.get("successList");
|
||||||
for (Map<String, Object> succ : succList) {
|
for (Map<String, Object> succ : succList) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user