From 4705f9b4084d9ccddb601569b223f0fb41778a94 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 12 Aug 2021 15:28:46 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 167 insertions(+), 1 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 d58e1b3..2898b19 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
@@ -1441,7 +1441,7 @@
serviceItem.setServicesId(newId);
Long beautyOldId = serviceItem.getId();
serviceItem.setId(null);
- serviceItem.setExtract("数据迁移");
+// serviceItem.setExtract("数据迁移");
sysBeauticianStateDao.insert(serviceItem);
beautyMaps.put(beautyOldId, serviceItem.getId());
}
@@ -1700,6 +1700,9 @@
for (SysBeauticianState state : sysBeauticianStates) {
Long staffId = state.getStaffId();
+ if (staffId == null) {
+ continue;
+ }
Integer integer = shopStaff.get(staffId.toString());
if (integer == null) {
@@ -1710,4 +1713,167 @@
sysBeauticianStateDao.update(state);
}
}
+
+ public void updateVipInfoStaff() {
+ Map<String, Integer> shopStaff = getRedisIds("shop_staff");
+
+ List<SysVipInfo> sysVipInfos = sysVipInfoDao.selectStaff();
+
+ for (SysVipInfo sysVipInfo : sysVipInfos) {
+ Long staffId = sysVipInfo.getStaffId();
+
+ Integer integer = shopStaff.get(staffId.toString());
+ if (integer == null) {
+ continue;
+ }
+
+ SysVipInfo update = new SysVipInfo();
+ update.setStaffId(integer.longValue());
+ update.setId(sysVipInfo.getId());
+ sysVipInfoDao.update(update);
+ }
+ }
+
+ @Transactional
+ public void updateVipInfoStaff(List<SysVipInfo> sysVipInfos) {
+ Map<String, Integer> shopStaff = getRedisIds("shop_staff");
+
+ for (SysVipInfo sysVipInfo : sysVipInfos) {
+ if (sysVipInfo.getStaffId() == null) {
+ continue;
+ }
+
+ Integer integer = shopStaff.get(sysVipInfo.getStaffId().toString());
+ if (integer == null) {
+ continue;
+ }
+
+ SysVipInfo exist = sysVipInfoDao.selectByPhone(sysVipInfo.getPhone());
+ if (exist.getStaffId() == integer.longValue()) {
+ continue;
+ }
+
+ sysVipInfoDao.updateStaffIdByPhone(integer.longValue(), sysVipInfo.getPhone());
+ }
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void updateProjUseIsCourse() {
+ List<SysProjUse> sysProjUses = sysProjUseDao.selectProjUse();
+
+ for (SysProjUse sysProjUs : sysProjUses) {
+ ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(sysProjUs.getProjId());
+
+ SysProjUse update = new SysProjUse();
+
+ if (shoppingGoods == null) {
+ continue;
+ }
+
+ if ("Y".equals(shoppingGoods.getIsCourse())) {
+ update.setIsCourse("Y");
+ } else {
+ continue;
+ }
+
+ update.setId(sysProjUs.getId());
+ sysProjUseDao.update(update);
+ }
+ }
+
+ @DS("slave")
+ public List<SysUsers> fixSysUsersOld() throws UnsupportedEncodingException, NoSuchAlgorithmException {
+ List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_shopstaff_info");
+
+ Map<String, Integer> shopMap = getRedisIds("shopId");
+ List<SysUsers> list = new ArrayList<>();
+ for (Map<String, Object> map : maps) {
+ SysUsers sysUsers = new SysUsers();
+ sysUsers.setSuAccount((String) map.get("staff_no"));
+ sysUsers.setSuId((Long) map.get("id"));
+ sysUsers.setSuName((String) map.get("staff_name"));
+ sysUsers.setSuSex((String) map.get("sex"));
+ sysUsers.setSuUserType("employee");
+ sysUsers.setSuAccountStatus(AppConstance.ACCOUNT_STATUS_INACTIVATED);
+ sysUsers.setSuValid("Y");
+ sysUsers.setCompanyId(companyId);
+ Long aaa = (Long) map.get("shop_id");
+ if (aaa != null) {
+ Integer shopId = shopMap.get(aaa.toString());
+ if (shopId != null) {
+ sysUsers.setShopId(Long.parseLong(shopId.toString()));
+ }
+ }
+ sysUsers.setSuRegisterTime(new Date());
+ sysUsers.setCreateBy(AppConstance.SYSTEM_USER);
+ sysUsers.setUpdateBy(AppConstance.SYSTEM_USER);
+ sysUsers.setSuPassword(PasswordUtil.getEncrypUserPwd(sysUsers));
+ list.add(sysUsers);
+ }
+
+ return list;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void fixSysUsersNew(List<SysUsers> list) {
+ Map<String, Integer> shopStaff = getRedisIds("shop_staff");
+
+ for (SysUsers sysUsers : list) {
+ SysUsers exist = sysUsersDao.selectSysUsersByName(sysUsers.getSuName());
+ if (exist != null) {
+ continue;
+ }
+
+ Integer newId = shopStaff.get(sysUsers.getSuId().toString());
+ sysUsers.setSuId(newId.longValue());
+ sysUsers.setCreateBy(AppConstance.SYSTEM_USER);
+ sysUsers.setUpdateBy(AppConstance.SYSTEM_USER);
+ sysUsersDao.insert(sysUsers);
+ }
+
+ }
+
+
+ @Transactional(rollbackFor = Exception.class)
+ public void fixShoppingGoods() {
+ List<ShoppingGoodsAssemble> shoppingGoodsAssembles = shoppingGoodsAssembleDao.selectProjIdNotNull();
+
+ for (ShoppingGoodsAssemble shoppingGoodsAssemble : shoppingGoodsAssembles) {
+ Map<String, Object> map = shoppingGoodsAssembleDao.selectProjInfoById(shoppingGoodsAssemble.getAssembleProjId());
+
+ String proj_name = map.get("PROJ_NAME").toString();
+ ShoppingGoods exist = shoppingGoodsDao.selectByNameAndDesc(proj_name, "数据修复");
+ if (exist != null) {
+ ShoppingGoodsAssemble update = new ShoppingGoodsAssemble();
+ update.setId(shoppingGoodsAssemble.getId());
+ update.setAssembleGoodId(exist.getId());
+ shoppingGoodsAssembleDao.update(update);
+ continue;
+ }
+
+ ShoppingGoods shoppingGoods = new ShoppingGoods();
+ shoppingGoods.setName(proj_name);
+ shoppingGoods.setTimeLength(Integer.parseInt(map.get("TIME_LENGTH").toString()));
+
+ shoppingGoods.setCompanyId(companyId);
+ shoppingGoods.setHeadquarters(1);
+ shoppingGoods.setIsDel(1);
+ shoppingGoods.setZjm(StringUtils.toHanyuPinyin(shoppingGoods.getName()) + "," + StringUtils.toHeadWordHanyuPinyin(shoppingGoods.getName()));
+
+ shoppingGoods.setWeiDescription("数据迁移");
+ shoppingGoods.setStaus("下架");
+ shoppingGoods.setGoodType("项目");
+ shoppingGoods.setIsPresent("否");
+ shoppingGoods.setIsOnce("0");
+ shoppingGoods.setWeiDescription("数据修复");
+
+ shoppingGoodsDao.insert(shoppingGoods);
+
+ ShoppingGoodsAssemble update = new ShoppingGoodsAssemble();
+ update.setId(shoppingGoodsAssemble.getId());
+ update.setAssembleGoodId(shoppingGoods.getId());
+ shoppingGoodsAssembleDao.update(update);
+ }
+ }
+
}
--
Gitblit v1.9.1