Merge remote-tracking branch 'origin/develop' into develop-yellow

src/custom/restcontroller/webmanage/sale/order/OrderItemsHelper.java

@@ -139,8 +139,8 @@ public class OrderItemsHelper extends BaseClass {
         } else if (balance.compareTo(BigDecimal.ZERO) > 0) {
             approvedamount = balance;
         }
-        System.out.println(saorderamount);
-        System.out.println(approvedamount);
+//        System.out.println(saorderamount);
+//        System.out.println(approvedamount);
 
         if (approvedamount.compareTo(BigDecimal.ZERO) > 0) {
             ArrayList<Long> sa_orderitemsids = rows.toArrayList("sa_orderitemsid", new ArrayList<>());
@@ -167,6 +167,8 @@ public class OrderItemsHelper extends BaseClass {
             entity.setSource("订单自动返利");
             entity.setSourcenote(orderRows.get(0).getString("sonum"));
             entity.setRemarks(orderRows.get(0).getString("sonum") + "订单自动返利");
+            entity.setType("公司支持");
+            entity.setTypemx("装修返利");
             JSONObject cashbillIncome = Accountbalance.createCashbillIncome(controller, sys_enterpriseid, sa_accountclassid, entity, true, true);
             sqlList.addAll(cashbillIncome.getJSONArray("sqlList").toJavaList(String.class));