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

Helius

2021-04-12 96eda9af2046e59fe3bc991f945682774b34e05c

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

@@ -1060,28 +1060,39 @@

    @DS("slave")
    public List<SysProjUse> projUseMoveOld() {
        List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_proj_use");
        List<Map<String, Object>> maps = jdbcTemplate.queryForList("select\n" +
                                                                            "\t\ta.ID,\n" +
                                                                            "\t\ta.VIP_ID,\n" +
                                                                            "\t\ta.TAOCAN_ID,\n" +
                                                                            "\t\ta.FAIL_TIME,\n" +
                                                                            "\t\ta.SOURCE,\n" +
                                                                            "\t\ta.STATUS,\n" +
                                                                            "\t\ta.ORDER_ITEM_ID,\n" +
                                                                            "\t\ta.PLATFORM_FLAG,\n" +
                                                                            "\t\ta.type,\n" +
                                                                            "\t\ta.balance,\n" +
                                                                            "\t\ta.remark,\n" +
                                                                            "        b.name projName,\n" +
                                                                            "        sum(a.SURPLUS_COUNT) SURPLUS_COUNT\n" +
                                                                            "\t\tfrom sys_proj_use a\n" +
                                                                            "\t\tleft join shopping_goods b on a.TAOCAN_ID= b.ID\n" +
                                                                            "where TAOCAN_ID IS NOT NULL\n" +
                                                                            "GROUP BY PLATFORM_FLAG\n" +
                                                                            "order by a.status");
        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");
        Map<String, Integer> order_item = getRedisIds("order_item");
        for (SysProjUse projUse : projUses) {
            projUse.setType("套餐");
            if (projUse.getTaocanId() != null) {
                Integer tcId = goodTc.get(projUse.getTaocanId().toString());
                if (tcId != null) {
                    projUse.setTaocanId(tcId.longValue());
                    projUse.setProjId(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());
                    projUse.setProjId(-projUse.getTaocanId());
                }
            }

@@ -1091,6 +1102,78 @@
            } else {
                projUse.setVipId(-projUse.getVipId());
            }

            if (projUse.getOrderItemId() != null && projUse.getOrderItemId() != 1) {
                Integer itemID = order_item.get(projUse.getOrderItemId().toString());
                if (itemID != null) {
                    projUse.setOrderItemId(itemID.longValue());
                } else {
                    projUse.setOrderItemId(-projUse.getOrderItemId());
                }
            }

            if ("无效".equals(projUse.getStatus())) {
                projUse.setIsOver("Y");
            }

            List<Map<String, Object>> projInfos = jdbcTemplate.queryForList("select a.*, b.PROJ_NAME from sys_proj_use a\n" +
                                                                                "left join sys_proj_info b on a.PROJ_ID=b.ID\n" +
                                                                                "where PLATFORM_FLAG='" + projUse.getPlatformFlag()+"'");

            List<SysProjUse> projInfoUses = mapsToListBean(projInfos, SysProjUse.class);
            for (SysProjUse projInfoUse : projInfoUses) {
                if (projInfoUse.getProjId() != null) {
                    Integer projId = goodProj.get(projInfoUse.getProjId().toString());
                    if (projId != null) {
                        projInfoUse.setProjId(projId.longValue());
                    } else {
                        projInfoUse.setProjId(-projInfoUse.getProjId());
                    }
                }

                Integer vipId2 = vipInfos.get(projInfoUse.getVipId().toString());
                if (vipId2 != null) {
                    projInfoUse.setVipId(vipId2.longValue());
                } else {
                    projInfoUse.setVipId(-projInfoUse.getVipId());
                }
                projInfoUse.setType("项目");
            }

            projUse.setTaocanProjUse(projInfoUses);
        }

        List<Map<String, Object>> projUsesInfoMap = jdbcTemplate.queryForList("select a.*, b.PROJ_NAME from sys_proj_use a left join sys_proj_info b on a.PROJ_ID=b.id where TAOCAN_ID is null");
        List<SysProjUse> sysProjUses = mapsToListBean(projUsesInfoMap, SysProjUse.class);
        for (SysProjUse sysProjUse : sysProjUses) {
            sysProjUse.setType("项目");
            sysProjUse.setDeductionNum(1);

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

            Integer vipId2 = vipInfos.get(sysProjUse.getVipId().toString());
            if (vipId2 != null) {
                sysProjUse.setVipId(vipId2.longValue());
            } else {
                sysProjUse.setVipId(-sysProjUse.getVipId());
            }

            if (sysProjUse.getOrderItemId() != null && sysProjUse.getOrderItemId() != 1) {
                Integer itemID = order_item.get(sysProjUse.getOrderItemId().toString());
                if (itemID != null) {
                    sysProjUse.setOrderItemId(itemID.longValue());
                } else {
                    sysProjUse.setOrderItemId(-sysProjUse.getOrderItemId());
                }
            }
            projUses.add(sysProjUse);
        }
        return projUses;
    }
@@ -1103,15 +1186,28 @@
        if (CollUtil.isNotEmpty(list)) {
            Map<Long, Long> map = new HashMap<>();
            for (SysProjUse sysProjUse : list) {
                if(sysProjUse.getType() == "套餐卡") {
                    sysProjUse.setType("套餐");
                } else if (StrUtil.isEmpty(sysProjUse.getType())){
                    sysProjUse.setType("项目");
                }

                Long oldId = sysProjUse.getId();
                sysProjUse.setId(null);
                sysProjUseDao.insert(sysProjUse);
                sysProjUse.setCreateBy("数据迁移");
                sysProjUse.setTaocanId(null);

                List<SysProjUse> taocanProjUses = sysProjUse.getTaocanProjUse();
                if (CollUtil.isNotEmpty(taocanProjUses)) {
                    sysProjUse.setIsCourse("N");
                    sysProjUseDao.insert(sysProjUse);
                    for (SysProjUse taocanProjUse : taocanProjUses) {
                        taocanProjUse.setTaocanId(sysProjUse.getId());
                        Long projOldId = taocanProjUse.getId();
                        taocanProjUse.setId(null);
                        taocanProjUse.setCreateBy("数据迁移");
                        taocanProjUse.setDeductionNum(1);
                        sysProjUseDao.insert(taocanProjUse);
                        map.put(projOldId, taocanProjUse.getId());
                    }
                } else {
                    sysProjUseDao.insert(sysProjUse);
                }

                map.put(oldId, sysProjUse.getId());
            }

@@ -1127,10 +1223,11 @@

        Map<String, Integer> vipInfos = getRedisIds("vip_info");
        Map<String, Integer> bedInfos = getRedisIds("bed_info");
        Map<String, Integer> sysUsers = getRedisIds("sys_users");
//        Map<String, Integer> sysUsers = getRedisIds("sys_users");
        Map<String, Integer> projUses = getRedisIds("proj_use");
        Map<String, Integer> goodProj = getRedisIds("shopping_goods_proj");
        Map<String, Integer> shopIds = getRedisIds("shopId");
        Map<String, Integer> shopStaff = getRedisIds("shop_staff");
        for (SysProjServices sysProjServices : list) {
            List<Map<String, Object>> beauticiansMap = jdbcTemplate.queryForList("select * from sys_beautician_state where SERVICES_ID=" + sysProjServices.getId());
//            Map<String, Object> bedStatesMap = jdbcTemplate.queryForMap("select * from sys_bed_state where SERVICE_ID=" + sysProjServices.getId());
@@ -1168,7 +1265,7 @@
            }

            if (sysProjServices.getBeauticianId() != null) {
                Integer beautyId = sysUsers.get(sysProjServices.getBeauticianId().toString());
                Integer beautyId = shopStaff.get(sysProjServices.getBeauticianId().toString());
                if (beautyId != null) {
                    sysProjServices.setBeauticianId(beautyId.longValue());
                } else {
@@ -1177,7 +1274,7 @@
            }

            if (sysProjServices.getDevisionId() != null) {
                Integer devisionId = sysUsers.get(sysProjServices.getDevisionId().toString());
                Integer devisionId = shopStaff.get(sysProjServices.getDevisionId().toString());
                if (devisionId != null) {
                    sysProjServices.setDevisionId(devisionId.longValue());
                } else {
@@ -1186,7 +1283,7 @@
            }

            if (sysProjServices.getCreateStaffId() != null) {
                Integer staffId = sysUsers.get(sysProjServices.getCreateStaffId().toString());
                Integer staffId = shopStaff.get(sysProjServices.getCreateStaffId().toString());
                if (staffId != null) {
                    sysProjServices.setCreateStaffId(staffId.longValue());
                } else {
@@ -1234,10 +1331,10 @@
                    achieveNew.setShopId(shopId != null ? shopId.longValue() : -achieveNew.getShopId());
                    achieveNew.setVipId(vipId != null ? vipId.longValue() : -achieveNew.getVipId());

                    Integer saleIdInt = sysUsers.get(achieveNew.getSaleId() == null ? "" : achieveNew.getSaleId().toString());
                    Integer saleIdInt = shopStaff.get(achieveNew.getSaleId() == null ? "" : achieveNew.getSaleId().toString());
                    achieveNew.setSaleId(saleIdInt == null ? -achieveNew.getSaleId() : saleIdInt);

                    Integer beaultyIdInt = sysUsers.get(achieveNew.getBeaultId() == null ? "" : achieveNew.getBeaultId().toString());
                    Integer beaultyIdInt = shopStaff.get(achieveNew.getBeaultId() == null ? "" : achieveNew.getBeaultId().toString());
                    achieveNew.setBeaultId(beaultyIdInt == null ? -achieveNew.getBeaultId() : beaultyIdInt);

                    if (achieveNew.getShoppingGoodsId() != null) {
@@ -1299,6 +1396,7 @@
                        achieveNew.setId(null);
                        achieveNew.setOrderItemId(beautyMaps.get(achieveNew.getOrderItemId()));
                        achieveNew.setServiceOrderId(newId);
                        achieveNew.setCompanyId(companyId);
                    }
                    achieveNewDao.batchInsert(achieveNews);
                }

 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml

@@ -165,7 +165,8 @@
        proj_name,
        tcName,
        deductionNum,
        is_course
        is_course,
        create_by
        )
        VALUES (
        #{id},
@@ -187,7 +188,8 @@
        #{projName},
        #{tcName},
        #{deductionNum},
        #{isCourse}
        #{isCourse},
        #{createBy}
        )
    </insert>


 zq-erp/src/test/java/com/matrix/DataMoveTest.java

@@ -122,7 +122,7 @@
        dataMove.shopStaffInfoNew(dataMove.shopStaffInfoOld());
    }

    @Test
//    @Test
    public void orderMoveTest() {
        dataMove.orderNew(dataMove.orderOld());
    }