From 73f21507e7647fa46d90debec38b945113d2357c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 09 Jul 2021 10:58:43 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
index 2f947e8..68f1701 100644
--- a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
@@ -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;
@@ -177,12 +177,13 @@
}
@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());
}
@@ -242,6 +243,7 @@
}
}
+ // sys_users 中 id 为 200 的无法找到
Long staffId = sysVipInfo.getStaffId();
if (staffId != null) {
Object o = sysUsersMap.get(staffId.toString());
@@ -986,8 +988,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 +1489,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());
--
Gitblit v1.9.1