Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into dat...

Helius

2021-03-25 d5d09e2668ee386ee5c46c6cb8e9b21b39368ade

Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move

 zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java

@@ -944,6 +944,7 @@
        flow.setVipId(sysOrder.getVipId());
        flow.setShopId(sysOrder.getShopId());
        flow.setCompanyId(sysOrder.getCompanyId());
        flow.setPayMethod(type);
        return flow;
    }

@@ -968,6 +969,7 @@
                sysOrderDao.insert(sysOrder);
                orderIds.put(oldOrderId, sysOrder.getId());

                if (CollUtil.isNotEmpty(sysOrder.getItems())) {
                for (SysOrderItem item : sysOrder.getItems()) {
                    Long oldItemId = item.getId();
                    item.setOrderId(sysOrder.getId());
@@ -975,11 +977,14 @@
                    sysOrderItemDao.insert(item);
                    itemIds.put(oldItemId, item.getId());
                }
                }

                if (CollUtil.isNotEmpty(sysOrder.getFlows())) {
                for (SysOrderFlow flow : sysOrder.getFlows()) {
                    flow.setOrderId(oldOrderId);
                    sysOrderFlowDao.insert(flow);
                }
                }

                if (CollUtil.isNotEmpty(sysOrder.getAchieveNews())) {
                    for (AchieveNew achieveNew : sysOrder.getAchieveNews()) {