modify

wzy

2021-03-25 cf42d3c66ac21efa6138986ad68748402d6ab06e

modify

 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,17 +969,21 @@
                sysOrderDao.insert(sysOrder);
                orderIds.put(oldOrderId, sysOrder.getId());

                for (SysOrderItem item : sysOrder.getItems()) {
                    Long oldItemId = item.getId();
                    item.setOrderId(sysOrder.getId());
                    item.setId(null);
                    sysOrderItemDao.insert(item);
                    itemIds.put(oldItemId, item.getId());
                if (CollUtil.isNotEmpty(sysOrder.getItems())) {
                    for (SysOrderItem item : sysOrder.getItems()) {
                        Long oldItemId = item.getId();
                        item.setOrderId(sysOrder.getId());
                        item.setId(null);
                        sysOrderItemDao.insert(item);
                        itemIds.put(oldItemId, item.getId());
                    }
                }

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

                if (CollUtil.isNotEmpty(sysOrder.getAchieveNews())) {