fix

Helius

2021-07-09 33123586eb93356e8aa386ce7faeab80c17c59f0

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

@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.matrix.component.redis.RedisClient;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
@@ -103,11 +104,12 @@
        return shopInfos;
    }

    @Transactional(rollbackFor = Exception.class)
    public void toNewShopInfo(List<SysShopInfo>  shopInfos) {
        if (CollUtil.isNotEmpty(shopInfos)) {
            Map<Long, Long> oldAndNewId = new HashMap<>();
            for (SysShopInfo shopInfo : shopInfos) {
                if (shopInfo.getShopName().equals("总部")) {
                if (shopInfo.getShopName().equals("总店")) {
                    shopInfo.setShopType(1);
                    shopInfo.setIsOpenNet(2);
                } else {
@@ -121,14 +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 {
                    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);
        }
@@ -166,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());
            }
@@ -238,6 +247,7 @@
                    }
                }

                // sys_users 中 id 为 200 的无法找到
                Long staffId = sysVipInfo.getStaffId();
                if (staffId != null) {
                    Object o = sysUsersMap.get(staffId.toString());
@@ -663,6 +673,18 @@
                    }
                }

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

                Long oldId = shoppingGoods.getId();
                shoppingGoods.setId(null);
                shoppingGoodsDao.insert(shoppingGoods);
@@ -981,6 +1003,9 @@
            for (SysOrder sysOrder : list) {
                Long oldOrderId = sysOrder.getId();
                sysOrder.setId(null);
                sysOrder.setCreateBy("数据迁移");
                sysOrder.setCreateTime(sysOrder.getOrderTime() == null ? DateUtil.stringToDate("2018-10-17 19:03:28", DateUtil.DATE_FORMAT_SS) : sysOrder.getOrderTime());
                sysOrder.setUpdateTime(sysOrder.getOrderTime() == null ? DateUtil.stringToDate("2018-10-17 19:03:28", DateUtil.DATE_FORMAT_SS) : sysOrder.getOrderTime());
                sysOrderDao.insert(sysOrder);
                orderIds.put(oldOrderId, sysOrder.getId());

@@ -1007,6 +1032,8 @@
                        }
                        flow.setOrderId(sysOrder.getId());
                        flow.setCreateBy("数据迁移");
                        flow.setCreateTime(sysOrder.getCreateTime());
                        flow.setUpdateTime(sysOrder.getUpdateTime());
                        sysOrderFlowDao.insert(flow);
                    }
                }
@@ -1478,6 +1505,9 @@
        for (MoneyCardUse moneyCardUse : moneyCardUses) {
            moneyCardUse.setIsVipCar("N");

            ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(moneyCardUse.getGoodsId());
            moneyCardUse.setCardName(shoppingGoods.getName());

            Integer vipId = null;
            if (moneyCardUse.getVipId() != null) {
                vipId = vipInfos.get(moneyCardUse.getVipId().toString());
@@ -1534,6 +1564,12 @@
                } else {
                    achieveNew.setPayMethod("划扣");
                }

//                if (achieveNew.getConsume() == null) {
//                    achieveNew.setPayMethod("现金");
//                } else {
//                    achieveNew.setPayMethod("划扣");
//                }
                achieveNew.setAchieveType("顾问业绩");
                achieveNew.setGoodsCash(Double.parseDouble(achieveNew.getT1()));
                achieveNewDao.updateByModel(achieveNew);