Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -1312,7 +1312,7 @@ public class OrderController {
                     // 设置综合税额
                     BigDecimal totalSalesIncTax = new BigDecimal(systemFormat.getTotalSalesInclTax());
                     BigDecimal taxRate = new BigDecimal(systemFormat.getTaxRate());
-                    systemFormat.setSales(totalSalesIncTax.divide(new BigDecimal(1).add(taxRate)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
+                    systemFormat.setSales(totalSalesIncTax.divide(new BigDecimal(1).add(taxRate),4,RoundingMode.HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
                     systemFormat.setTaxAmount(totalSalesIncTax.subtract(new BigDecimal(systemFormat.getSales())).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
 
                     // 设置实际销售额