modify

Helius

2021-04-23 c0c0a5f242c43b5e5e3ab833ec4d8dd13d660cd7

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

@@ -107,7 +107,7 @@
        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 {
@@ -126,6 +126,9 @@
                    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());
                }
@@ -491,6 +494,11 @@
            shoppingGood.setIsDel(1);
            shoppingGood.setZjm(StringUtils.toHanyuPinyin(shoppingGood.getName()) + "," + StringUtils.toHeadWordHanyuPinyin(shoppingGood.getName()));

            if (shoppingGood.getCarUseCount() != null) {
                shoppingGood.setIsCourse("Y");
                shoppingGood.setIsInfinite("N");
            }

            shoppingGood.setWeiDescription("数据迁移-tc");

            List<ShoppingGoodsAssemble> assembleList = mapsToListBean(assembles, ShoppingGoodsAssemble.class);
@@ -632,6 +640,7 @@
            }

            shoppingGood.setAssembleGoods(assembleList);
            shoppingGood.setIsInfinite("N");
        }

        return shoppingGoods;
@@ -975,6 +984,9 @@
            for (SysOrder sysOrder : list) {
                Long oldOrderId = sysOrder.getId();
                sysOrder.setId(null);
                sysOrder.setCreateBy("数据迁移");
                sysOrder.setCreateTime(sysOrder.getOrderTime());
                sysOrder.setUpdateTime(sysOrder.getOrderTime());
                sysOrderDao.insert(sysOrder);
                orderIds.put(oldOrderId, sysOrder.getId());

@@ -1073,7 +1085,7 @@
                                                                            "\t\ta.balance,\n" +
                                                                            "\t\ta.remark,\n" +
                                                                            "        b.name projName,\n" +
                                                                            "        sum(a.SURPLUS_COUNT) SURPLUS_COUNT\n" +
                                                                            "        a.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" +
@@ -1506,4 +1518,41 @@
        }
    }


    @Transactional(rollbackFor = Exception.class)
    public void tyOrderAndAchieveMove() {
        jdbcTemplate.update("update sys_order set orderType=1, is_has_refund=2 where 1=1");

        List<SysOrderFlow> flows = sysOrderFlowDao.selectOrderFlowByType();
        if (CollUtil.isNotEmpty(flows)) {
            for (SysOrderFlow flow : flows) {
                SysOrder sysOrder = sysOrderDao.selectById(flow.getOrderId());
                sysOrder.setIsHasRefund(1);
                sysOrderDao.update(sysOrder);
            }
        }

        List<AchieveNew> achieveNews = achieveNewDao.selectAchieveForOrder();
        if (CollUtil.isNotEmpty(achieveNews)) {
            for (AchieveNew achieveNew : achieveNews) {
                if ("现金业绩".equalsIgnoreCase(achieveNew.getAchieveType())) {
                    achieveNew.setPayMethod("现金");
                } else {
                    achieveNew.setPayMethod("划扣");
                }

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

        }

    }

}