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

wzy

2021-03-25 1b51c3e64ba8117900d594fcd5b677336e4759bc

 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())) {
@@ -997,4 +1002,39 @@
        }
    }

    @DS("slave")
    public List<SysBedInfo> bedInfoOld() {
        List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_bed_info");
        List<SysBedInfo> beds = mapsToListBean(maps, SysBedInfo.class);

        Map<String, Integer> shopIds = getRedisIds("shopId");
        for (SysBedInfo bed : beds) {
            Integer shopId = shopIds.get(bed.getShopId().toString());
            if (shopId != null) {
                bed.setShopId(shopId.longValue());
            } else {
                bed.setShopId(-bed.getShopId());
            }
        }
        return beds;
    }

    @Autowired
    private SysBedInfoDao sysBedInfoDao;

    @Transactional(rollbackFor = Exception.class)
    public void bedInfoNew(List<SysBedInfo> list) {
        if (CollUtil.isNotEmpty(list)) {
            Map<Long, Long> map = new HashMap<>();
            for (SysBedInfo bed : list) {
                Long oldId = bed.getId();
                bed.setId(null);
                sysBedInfoDao.insert(bed);
                map.put(oldId, bed.getId());
            }

            redisClient.saveMapValue("bed_info", map);
        }
    }

}