beauty-erp.git - Gitblit

			@@ -1,11 +1,11 @@
			package com.matrix.system.dataMove;

			import cn.hutool.core.collection.CollUtil;
			import cn.hutool.core.date.DateUtil;
			import cn.hutool.core.util.StrUtil;
			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;
			@@ -242,6 +242,7 @@
			}
			}

			// sys_users 中 id 为 200 的无法找到
			Long staffId = sysVipInfo.getStaffId();
			if (staffId != null) {
			Object o = sysUsersMap.get(staffId.toString());
			@@ -986,8 +987,8 @@
			Long oldOrderId = sysOrder.getId();
			sysOrder.setId(null);
			sysOrder.setCreateBy("数据迁移");
			sysOrder.setCreateTime(sysOrder.getOrderTime());
			sysOrder.setUpdateTime(sysOrder.getOrderTime());
			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());

			@@ -1487,6 +1488,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());