Merge remote-tracking branch 'origin/api' into api

935090232@qq.com

2021-01-15 19fb7fa1fdbcee7cecfee1554610bb40f40e2976

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java

@@ -221,7 +221,11 @@

        sysOrder.getItems().forEach(sysOrderItem -> {
            sysOrderItem.setOrderId(sysOrder.getId());
            // 取负数
            sysOrderItem.setCount(-sysOrderItem.getCount());
            orderItemDao.insert(sysOrderItem);
            // 调整回来
            sysOrderItem.setCount(-sysOrderItem.getCount());
        });

        return sysOrder;
@@ -794,6 +798,8 @@
            }

            refundTotal += flow.getAmount().doubleValue();
            flow.setShopId(sourceOrder.getShopId());
            flow.setCompanyId(sourceOrder.getCompanyId());
            sysOrderFlowDao.insert(flow);
            i++;
        }