Merge branch 'master-invoice-modular' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderInvoiceBiz.java

@@ -94,7 +94,7 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 					double cost = orderAccountBiz.getAllOrderCost(baseOrder.getId());
 					log.info("{}退款费用总计：{}",baseOrder.getNo(), cost);
 					log.info("{}订单实际金额：{}", baseOrder.getNo(), baseOrder.getRealAmount());
-					BigDecimal bigDecimal = new BigDecimal(baseOrder.getRealAmount().doubleValue() - cost).setScale(2,BigDecimal.ROUND_UP);
+					BigDecimal bigDecimal = new BigDecimal(baseOrder.getRealAmount().doubleValue() - cost).setScale(2, BigDecimal.ROUND_HALF_UP);
 					orderData.setPrice(bigDecimal);
 					log.info("{}用户实际支付金额: {}", baseOrder.getNo(), orderData.getPrice());
 					list.add(orderData);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -195,7 +195,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         pages.getData().parallelStream().forEach(data -> {
             data.setQrcodeStr(qrcodePrefix);
 
-            BigDecimal bigDecimal = new BigDecimal(data.getRealAmount().doubleValue()-orderAccountBiz.getAllOrderCost(data.getId())).setScale(2,BigDecimal.ROUND_UP);
+            BigDecimal bigDecimal = new BigDecimal(data.getRealAmount().doubleValue()-orderAccountBiz.getAllOrderCost(data.getId())).setScale(2,BigDecimal.ROUND_HALF_UP);
             data.setOrderRealAmount(bigDecimal);
             log.info("订单实际支付金额，扣除押金违章之后: {}", data.getOrderRealAmount());
         });
@@ -513,9 +513,4 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         return baseOrderBiz.updateBaseOrder(baseOrder);
     }
 
-    public static void main(String[] args) {
-        BigDecimal bigDecimal = new BigDecimal("0");
-        System.out.println(bigDecimal.add(new BigDecimal(1)));
-    }
-
 }