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

Helius

2021-03-25 d5d09e2668ee386ee5c46c6cb8e9b21b39368ade

 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())) {
@@ -1032,4 +1037,41 @@
        }
    }

    @DS("slave")
    public List<SysProjUse> projUseMoveOld() {
        List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_proj_use");
        List<SysProjUse> projUses = mapsToListBean(maps, SysProjUse.class);

        Map<String, Integer> goodProj = getRedisIds("shopping_goods_proj");
        Map<String, Integer> goodTc = getRedisIds("shopping_goods_tc");
        Map<String, Integer> vipInfos = getRedisIds("vip_info");
        for (SysProjUse projUse : projUses) {
            if (projUse.getTaocanId() != null) {
                Integer tcId = goodTc.get(projUse.getTaocanId().toString());
                if (tcId != null) {
                    projUse.setTaocanId(tcId.longValue());
                } else {
                    projUse.setTaocanId(-projUse.getTaocanId());
                }
            }

            if (projUse.getProjId() != null) {
                Integer projId = goodProj.get(projUse.getProjId().toString());
                if (projId != null) {
                    projUse.setProjId(projId.longValue());
                } else {
                    projUse.setProjId(-projUse.getProjId());
                }
            }

            Integer vipId = vipInfos.get(projUse.getVipId().toString());
            if (vipId != null) {
                projUse.setVipId(vipId.longValue());
            } else {
                projUse.setVipId(-projUse.getVipId());
            }
        }
        return projUses;
    }

}