|
@@ -1312,10 +1312,9 @@ public class OrderController {
|
|
// 设置综合税额
|
|
// 设置综合税额
|
|
BigDecimal totalSalesIncTax = new BigDecimal(systemFormat.getTotalSalesInclTax());
|
|
BigDecimal totalSalesIncTax = new BigDecimal(systemFormat.getTotalSalesInclTax());
|
|
BigDecimal taxRate = new BigDecimal(systemFormat.getTaxRate());
|
|
BigDecimal taxRate = new BigDecimal(systemFormat.getTaxRate());
|
|
- systemFormat.setTaxAmount(totalSalesIncTax.multiply(taxRate).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
|
|
|
|
- // 设置商品销售额(税前)
|
|
|
|
- BigDecimal taxAmount = new BigDecimal(systemFormat.getTaxAmount());
|
|
|
|
- systemFormat.setSales(totalSalesIncTax.subtract(taxAmount).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
|
|
|
|
|
|
+ systemFormat.setSales(totalSalesIncTax.divide(new BigDecimal(1).add(taxRate)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
|
|
|
|
+ systemFormat.setTaxAmount(totalSalesIncTax.subtract(new BigDecimal(systemFormat.getSales())).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
|
|
|
|
+
|
|
// 设置实际销售额
|
|
// 设置实际销售额
|
|
BigDecimal unitSold = new BigDecimal(systemFormat.getUnitSold());
|
|
BigDecimal unitSold = new BigDecimal(systemFormat.getUnitSold());
|
|
systemFormat.setCurrentPrice(totalSalesIncTax.divide(unitSold,2,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP).toEngineeringString());
|
|
systemFormat.setCurrentPrice(totalSalesIncTax.divide(unitSold,2,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP).toEngineeringString());
|