modify

Helius

2021-04-25 2c429d2d99eaeeb4c6f6eee1e256f3b2fd27965d

 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;
@@ -107,7 +108,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 +127,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());
                }
@@ -981,6 +985,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 +1014,8 @@
                        }
                        flow.setOrderId(sysOrder.getId());
                        flow.setCreateBy("数据迁移");
                        flow.setCreateTime(sysOrder.getCreateTime());
                        flow.setUpdateTime(sysOrder.getUpdateTime());
                        sysOrderFlowDao.insert(flow);
                    }
                }
@@ -1534,6 +1543,12 @@
                } else {
                    achieveNew.setPayMethod("划扣");
                }

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