|
@@ -149,8 +149,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
|
|
|
}
|
|
|
String s = toSufExpr(formula_string);
|
|
|
BigDecimal detailsAmountOld = calSufExpr(s);
|
|
|
- Double amount = detailsAmountOld.doubleValue();
|
|
|
- BigDecimal detailsAmount = new BigDecimal(amount).setScale(2,RoundingMode.HALF_UP);
|
|
|
+ BigDecimal detailsAmount = detailsAmountOld.setScale(2,RoundingMode.HALF_UP);
|
|
|
BmstruckDetailsOrder bmstruckDetailsOrder = new BmstruckDetailsOrder();
|
|
|
if (orderType.intValue() == 3) {
|
|
|
BigDecimal purchaseOrderId = getFormulaMembers(orderId);
|
|
@@ -206,8 +205,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
|
|
|
//BigDecimal detailsAmountOld=new BigDecimal(0);
|
|
|
try {
|
|
|
BigDecimal detailsAmountOld = generateTruckFees(orderId, weightTaskResultId);
|
|
|
- Double amount = detailsAmountOld.doubleValue();
|
|
|
- BigDecimal detailsAmount = new BigDecimal(amount).setScale(2,RoundingMode.HALF_UP);
|
|
|
+ BigDecimal detailsAmount = detailsAmountOld.setScale(2,RoundingMode.HALF_UP);
|
|
|
BigDecimal orderType = bmstruckDetailsOrderMapper.getOrderType(orderId);
|
|
|
BmstruckDetailsOrder bmstruckDetailsOrder = new BmstruckDetailsOrder();
|
|
|
if (orderType.intValue() == 3) {
|