fix

Helius

2021-07-12 e47e795b062e68b55aa28c955a2c8407c6ed9cb5

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

@@ -64,7 +64,7 @@
    private RedisClient redisClient;

    private Long companyId = 35L;
    private Long shopId = 38L;
    private Long shopId = 60L;

    public List<Map<String, Object>> dataMove() {
        return jdbcTemplate.queryForList("select * from sys_vip_info limit 10");
@@ -104,6 +104,7 @@
        return shopInfos;
    }

    @Transactional(rollbackFor = Exception.class)
    public void toNewShopInfo(List<SysShopInfo>  shopInfos) {
        if (CollUtil.isNotEmpty(shopInfos)) {
            Map<Long, Long> oldAndNewId = new HashMap<>();
@@ -122,17 +123,20 @@
                query.setShopNo(shopInfo.getShopNo());
                Long oldId = shopInfo.getId();
                shopInfo.setId(null);
                // TODO 若迁往正式环境，这里需要变动
                if (!shopInfo.getShopName().contains("美度") && !shopInfo.getShopName().contains("总店")) {
                    sysShopInfoDao.insert(shopInfo);
                    oldAndNewId.put(oldId, shopInfo.getId());
                } else {
                    if (shopInfo.getShopName().equals("总店")) {
                        shopInfo.setShopName("美度(总部)");
                    }
                    SysShopInfo sysShopInfo = sysShopInfoDao.selectByShopName(shopInfo.getShopName());
                    oldAndNewId.put(oldId, sysShopInfo.getId());
                }

                sysShopInfoDao.insert(shopInfo);
                oldAndNewId.put(oldId, shopInfo.getId());
//                // TODO 若迁往正式环境，这里需要变动
//                if (!shopInfo.getShopName().contains("美度") && !shopInfo.getShopName().contains("总店")) {
//                    sysShopInfoDao.insert(shopInfo);
//                    oldAndNewId.put(oldId, shopInfo.getId());
//                } else {
//                    if (shopInfo.getShopName().equals("总店")) {
//                        shopInfo.setShopName("美度(总部)");
//                    }
//                    SysShopInfo sysShopInfo = sysShopInfoDao.selectByShopName(shopInfo.getShopName());
//                    oldAndNewId.put(oldId, sysShopInfo.getId());
//                }
            }
            redisClient.saveMapValue("shopId", oldAndNewId);
        }
@@ -170,19 +174,20 @@
            sysUsers.setSuRegisterTime((Date) map.get("register_time"));
            sysUsers.setCreateBy(AppConstance.SYSTEM_USER);
            sysUsers.setUpdateBy(AppConstance.SYSTEM_USER);
            sysUsers.setSuPassword(PasswordUtil.getEncrypUserPwd(sysUsers));
//            sysUsers.setSuPassword(PasswordUtil.getEncrypUserPwd(sysUsers));
            list.add(sysUsers);
        }
        return list;
    }

    @Transactional(rollbackFor = Exception.class)
    public void newSysUsers(List<SysUsers> list) {
    public void newSysUsers(List<SysUsers> list) throws UnsupportedEncodingException, NoSuchAlgorithmException {
        if (CollUtil.isNotEmpty(list)) {
            Map<Long, Long> sysUsersOldAndNew = new HashMap<>();
            for (SysUsers sysUsers : list) {
                Long oldId = sysUsers.getSuId();
                sysUsers.setSuId(null);
                sysUsers.setSuPassword(PasswordUtil.getEncrypUserPwd(sysUsers));
                sysUsersDao.insert(sysUsers);
                sysUsersOldAndNew.put(oldId, sysUsers.getSuId());
            }
@@ -668,6 +673,20 @@
                    }
                }

                if ("否".equals(shoppingGoods.getIsOnce())) {
                    shoppingGoods.setIsOnce("0");
                } else {
                    shoppingGoods.setIsOnce("1");
                }

                if (StrUtil.isNotBlank(shoppingGoods.getIsPresent())) {
                    if ("否".equals(shoppingGoods.getIsPresent())) {
                        shoppingGoods.setIsPresent("0");
                    } else {
                        shoppingGoods.setIsPresent("1");
                    }
                }

                Long oldId = shoppingGoods.getId();
                shoppingGoods.setId(null);
                shoppingGoodsDao.insert(shoppingGoods);
@@ -681,6 +700,20 @@

                            Long oldIdTc = assembleGood.getAssembleSkuId() == null ? assembleGood.getAssembleProjId() : assembleGood.getAssembleSkuId();
                            if (assembleGood.getShoppingGoods() != null) {

                                if ("否".equals(assembleGood.getShoppingGoods().getIsOnce())) {
                                    assembleGood.getShoppingGoods().setIsOnce("0");
                                } else {
                                    assembleGood.getShoppingGoods().setIsOnce("1");
                                }

                                if (StrUtil.isNotBlank(assembleGood.getShoppingGoods().getIsPresent())) {
                                    if ("否".equals(assembleGood.getShoppingGoods().getIsPresent())) {
                                        assembleGood.getShoppingGoods().setIsPresent("0");
                                    } else {
                                        assembleGood.getShoppingGoods().setIsPresent("1");
                                    }
                                }

                                assembleGood.getShoppingGoods().setId(null);
                                shoppingGoodsDao.insert(assembleGood.getShoppingGoods());
@@ -752,6 +785,20 @@
                    Integer cateId = goodsCategory.get(shoppingGoods.getCateId().toString());
                    if (cateId != null) {
                        shoppingGoods.setCateId(Long.parseLong(cateId.toString()));
                    }
                }

                if ("否".equals(shoppingGoods.getIsOnce())) {
                    shoppingGoods.setIsOnce("0");
                } else {
                    shoppingGoods.setIsOnce("1");
                }

                if (StrUtil.isNotBlank(shoppingGoods.getIsPresent())) {
                    if ("否".equals(shoppingGoods.getIsPresent())) {
                        shoppingGoods.setIsPresent("0");
                    } else {
                        shoppingGoods.setIsPresent("1");
                    }
                }

@@ -1394,7 +1441,7 @@
                        serviceItem.setServicesId(newId);
                        Long beautyOldId = serviceItem.getId();
                        serviceItem.setId(null);
                        serviceItem.setExtract("数据迁移");
//                        serviceItem.setExtract("数据迁移");
                        sysBeauticianStateDao.insert(serviceItem);
                        beautyMaps.put(beautyOldId, serviceItem.getId());
                    }
@@ -1488,6 +1535,10 @@
        for (MoneyCardUse moneyCardUse : moneyCardUses) {
            moneyCardUse.setIsVipCar("N");

            ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(moneyCardUse.getGoodsId());
            if (shoppingGoods != null)
            {            moneyCardUse.setCardName(shoppingGoods.getName());}

            Integer vipId = null;
            if (moneyCardUse.getVipId() != null) {
                vipId = vipInfos.get(moneyCardUse.getVipId().toString());
@@ -1559,4 +1610,148 @@

    }


    @DS("slave")
    public Map<String, List<Long>> roleOld() {
        List<Map<String, Object>> maps = jdbcTemplate.queryForList("select a.id, a.name, a.role_id, b.role_name from users a inner join sys_role b on find_in_set(b.role_id, a.role_id)");

        List<Long> jkgw = new ArrayList<>();
        List<Long> mls = new ArrayList<>();
        for (Map<String, Object> map : maps) {
            String roleName = map.get("role_name").toString();

            if ("健康顾问".equals(roleName)) {
                jkgw.add((Long) map.get("id"));
            } else {
                mls.add((Long) map.get("id"));
            }
        }

        Map<String, List<Long>> result = new HashMap<>();
        result.put("jkgw", jkgw);
        result.put("mls", mls);
        return result;
    }

    public void roleNew(Map<String, List<Long>> role) {
        List<Long> jkgw = role.get("jkgw");
        List<Long> mls = role.get("mls");
        Map<String, Integer> sysUsersMap = getRedisIds("sys_users");

        for (Long aLong : jkgw) {
            Integer id = sysUsersMap.get(aLong.toString());
            SysUsers sysUsers = new SysUsers();
            sysUsers.setSuId(id.longValue());
            sysUsers.setRoleIds("56");
            sysUsersDao.updateByModel(sysUsers);
        }

        for (Long ml : mls) {
            Integer id = sysUsersMap.get(ml.toString());
            SysUsers sysUsers = new SysUsers();
            sysUsers.setSuId(id.longValue());
            sysUsers.setRoleIds("55");
            sysUsersDao.updateByModel(sysUsers);
        }

    }

    @DS("slave")
    public Map<String, String> roleOld2() {
        List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_shopstaff_info where find_in_set('美疗师', POST_TYPE_NAME) or find_in_set('健康顾问', POST_TYPE_NAME)");
        Map<String, String> result = new HashMap<>();
        for (Map<String, Object> map : maps) {

            result.put(map.get("id").toString(), map.get("POST_TYPE_NAME").toString());
        }

        return result;
    }

    public void roleNew2(Map<String, String> map) {

        Map<String, Integer> shopStaff = getRedisIds("shop_staff");
        for (Map.Entry<String, String> entry : map.entrySet()) {
            String id = entry.getKey();
            Integer newId = shopStaff.get(id);

            SysUsers sysUsers = new SysUsers();
            sysUsers.setSuId(newId.longValue());
            if (entry.getValue().contains("健康顾问,")) {
                sysUsers.setRoleIds("56");
            }

            if (entry.getValue().contains("美疗师,")) {
                sysUsers.setRoleIds("55");
            }

            if (entry.getValue().contains("健康顾问,美疗师,")) {
                sysUsers.setRoleIds("55,56");
            }

            sysUsersDao.updateByModel(sysUsers);
        }
    }

    public void updateServiceOrderStaff() {
        Map<String, Integer> shopStaff = getRedisIds("shop_staff");

        List<SysBeauticianState> sysBeauticianStates = sysBeauticianStateDao.selectByModel(null);
        for (SysBeauticianState state : sysBeauticianStates) {
            Long staffId = state.getStaffId();

            Integer integer = shopStaff.get(staffId.toString());

            if (integer == null) {
                state.setStaffId(-staffId);
            } else {
                state.setStaffId(integer.longValue());
            }
            sysBeauticianStateDao.update(state);
        }
    }

    public void updateVipInfoStaff() {
        Map<String, Integer> shopStaff = getRedisIds("shop_staff");

        List<SysVipInfo> sysVipInfos = sysVipInfoDao.selectStaff();

        for (SysVipInfo sysVipInfo : sysVipInfos) {
            Long staffId = sysVipInfo.getStaffId();

            Integer integer = shopStaff.get(staffId.toString());
            if (integer == null) {
                continue;
            }

            SysVipInfo update = new SysVipInfo();
            update.setStaffId(integer.longValue());
            update.setId(sysVipInfo.getId());
            sysVipInfoDao.update(update);
        }
    }

    @Transactional(rollbackFor = Exception.class)
    public void updateProjUseIsCourse() {
        List<SysProjUse> sysProjUses = sysProjUseDao.selectProjUse();

        for (SysProjUse sysProjUs : sysProjUses) {
            ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(sysProjUs.getProjId());

            SysProjUse update = new SysProjUse();

            if (shoppingGoods == null) {
                continue;
            }

            if ("Y".equals(shoppingGoods.getIsCourse())) {
                update.setIsCourse("Y");
            } else {
                continue;
            }

            update.setId(sysProjUs.getId());
            sysProjUseDao.update(update);
        }
    }
}