Merge branch 'master-invoice-modular' into dev

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

@@ -803,7 +803,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         if (list != null && list.size() > 0) {
             list.parallelStream().forEach(result -> {
                 if(result.getAccountAmount() != null) {
-                    bigDecimal.add(result.getAccountAmount());
+                    bigDecimal.add(new BigDecimal(result.getAccountAmount().toString()));
                 }
             });
         }

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

@@ -511,6 +511,9 @@ 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)));
+    }
 
 }