From 33123586eb93356e8aa386ce7faeab80c17c59f0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 09 Jul 2021 14:34:40 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 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 ae12e32..86201e4 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
@@ -104,6 +104,7 @@
return shopInfos;
}
+ @Transactional(rollbackFor = Exception.class)
public void toNewShopInfo(List<SysShopInfo> shopInfos) {
if (CollUtil.isNotEmpty(shopInfos)) {
Map<Long, Long> oldAndNewId = new HashMap<>();
@@ -122,17 +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 {
- if (shopInfo.getShopName().equals("总店")) {
- shopInfo.setShopName("美度(总部)");
- }
- 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);
}
@@ -170,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());
}
@@ -242,6 +247,7 @@
}
}
+ // sys_users 中 id 为 200 的无法找到
Long staffId = sysVipInfo.getStaffId();
if (staffId != null) {
Object o = sysUsersMap.get(staffId.toString());
@@ -665,6 +671,18 @@
if (cateId != null) {
shoppingGoods.setCateId(Long.parseLong(cateId.toString()));
}
+ }
+
+ 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();
@@ -1487,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());
--
Gitblit v1.9.1