From d388e2788b7ef088d7cd40f901b0acdcec460bc3 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 01 Apr 2021 00:19:23 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 204 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 181 insertions(+), 23 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 04fbd40..086cf75 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
@@ -15,6 +15,7 @@
import com.matrix.system.hive.service.SysVipInfoService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -778,15 +779,20 @@
Map<String, Integer> goodCZK = getRedisIds("shopping_goods_czk");
Map<String, Integer> goodZHK = getRedisIds("shopping_goods_zhk");
Map<String, Integer> shopIds = getRedisIds("shopId");
- Map<String, Integer> sysUsers = getRedisIds("sys_users");
+// Map<String, Integer> sysUsers = getRedisIds("sys_users");
Map<String, Integer> vipInfos = getRedisIds("vip_info");
+ Map<String, Integer> shopStaff = getRedisIds("shop_staff");
for (SysOrder order : orders) {
List<Map<String, Object>> itemsMap = jdbcTemplate.queryForList("select * from sys_order_item where ORDER_ID=" + order.getId());
Integer shopId = shopIds.get(order.getShopId().toString());
order.setShopId(shopId.longValue());
- Integer statffId = sysUsers.get(order.getStaffId().toString());
+ if ("已付款".equals(order.getStatu()) || "欠款".equals(order.getStatu())) {
+ order.setPayTime(order.getOrderTime());
+ }
+
+ Integer statffId = shopStaff.get(order.getStaffId().toString());
if (statffId != null) {
order.setStaffId(statffId.longValue());
} else {
@@ -907,14 +913,14 @@
} else {
achieve.setAchieveType("美疗师业绩");
}
- Integer beaultId = sysUsers.get(achieve.getBeaultId().toString());
+ Integer beaultId = shopStaff.get(achieve.getBeaultId().toString());
if (beaultId != null) {
achieve.setBeaultId(beaultId.longValue());
} else {
achieve.setBeaultId(-achieve.getBeaultId());
}
- Integer saleId = sysUsers.get(achieve.getSaleId().toString());
+ Integer saleId = shopStaff.get(achieve.getSaleId().toString());
if (saleId != null) {
achieve.setSaleId(saleId.longValue());
} else {
@@ -1054,28 +1060,39 @@
@DS("slave")
public List<SysProjUse> projUseMoveOld() {
- List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_proj_use");
+ List<Map<String, Object>> maps = jdbcTemplate.queryForList("select\n" +
+ "\t\ta.ID,\n" +
+ "\t\ta.VIP_ID,\n" +
+ "\t\ta.TAOCAN_ID,\n" +
+ "\t\ta.FAIL_TIME,\n" +
+ "\t\ta.SOURCE,\n" +
+ "\t\ta.STATUS,\n" +
+ "\t\ta.ORDER_ITEM_ID,\n" +
+ "\t\ta.PLATFORM_FLAG,\n" +
+ "\t\ta.type,\n" +
+ "\t\ta.balance,\n" +
+ "\t\ta.remark,\n" +
+ " b.name projName,\n" +
+ " sum(a.SURPLUS_COUNT) SURPLUS_COUNT\n" +
+ "\t\tfrom sys_proj_use a\n" +
+ "\t\tleft join shopping_goods b on a.TAOCAN_ID= b.ID\n" +
+ "where TAOCAN_ID IS NOT NULL\n" +
+ "GROUP BY PLATFORM_FLAG\n" +
+ "order by a.status");
List<SysProjUse> projUses = mapsToListBean(maps, SysProjUse.class);
Map<String, Integer> goodProj = getRedisIds("shopping_goods_proj");
Map<String, Integer> goodTc = getRedisIds("shopping_goods_tc");
Map<String, Integer> vipInfos = getRedisIds("vip_info");
+ Map<String, Integer> order_item = getRedisIds("order_item");
for (SysProjUse projUse : projUses) {
+ projUse.setType("套餐");
if (projUse.getTaocanId() != null) {
Integer tcId = goodTc.get(projUse.getTaocanId().toString());
if (tcId != null) {
- projUse.setTaocanId(tcId.longValue());
+ projUse.setProjId(tcId.longValue());
} else {
- projUse.setTaocanId(-projUse.getTaocanId());
- }
- }
-
- if (projUse.getProjId() != null) {
- Integer projId = goodProj.get(projUse.getProjId().toString());
- if (projId != null) {
- projUse.setProjId(projId.longValue());
- } else {
- projUse.setProjId(-projUse.getProjId());
+ projUse.setProjId(-projUse.getTaocanId());
}
}
@@ -1085,6 +1102,78 @@
} else {
projUse.setVipId(-projUse.getVipId());
}
+
+ if (projUse.getOrderItemId() != null && projUse.getOrderItemId() != 1) {
+ Integer itemID = order_item.get(projUse.getOrderItemId().toString());
+ if (itemID != null) {
+ projUse.setOrderItemId(itemID.longValue());
+ } else {
+ projUse.setOrderItemId(-projUse.getOrderItemId());
+ }
+ }
+
+ if ("无效".equals(projUse.getStatus())) {
+ projUse.setIsOver("Y");
+ }
+
+ List<Map<String, Object>> projInfos = jdbcTemplate.queryForList("select a.*, b.PROJ_NAME from sys_proj_use a\n" +
+ "left join sys_proj_info b on a.PROJ_ID=b.ID\n" +
+ "where PLATFORM_FLAG='" + projUse.getPlatformFlag()+"'");
+
+ List<SysProjUse> projInfoUses = mapsToListBean(projInfos, SysProjUse.class);
+ for (SysProjUse projInfoUse : projInfoUses) {
+ if (projInfoUse.getProjId() != null) {
+ Integer projId = goodProj.get(projInfoUse.getProjId().toString());
+ if (projId != null) {
+ projInfoUse.setProjId(projId.longValue());
+ } else {
+ projInfoUse.setProjId(-projInfoUse.getProjId());
+ }
+ }
+
+ Integer vipId2 = vipInfos.get(projInfoUse.getVipId().toString());
+ if (vipId2 != null) {
+ projInfoUse.setVipId(vipId2.longValue());
+ } else {
+ projInfoUse.setVipId(-projInfoUse.getVipId());
+ }
+ projInfoUse.setType("项目");
+ }
+
+ projUse.setTaocanProjUse(projInfoUses);
+ }
+
+ List<Map<String, Object>> projUsesInfoMap = jdbcTemplate.queryForList("select a.*, b.PROJ_NAME from sys_proj_use a left join sys_proj_info b on a.PROJ_ID=b.id where TAOCAN_ID is null");
+ List<SysProjUse> sysProjUses = mapsToListBean(projUsesInfoMap, SysProjUse.class);
+ for (SysProjUse sysProjUse : sysProjUses) {
+ sysProjUse.setType("项目");
+ sysProjUse.setDeductionNum(1);
+
+ if (sysProjUse.getProjId() != null) {
+ Integer projId = goodProj.get(sysProjUse.getProjId().toString());
+ if (projId != null) {
+ sysProjUse.setProjId(projId.longValue());
+ } else {
+ sysProjUse.setProjId(-sysProjUse.getProjId());
+ }
+ }
+
+ Integer vipId2 = vipInfos.get(sysProjUse.getVipId().toString());
+ if (vipId2 != null) {
+ sysProjUse.setVipId(vipId2.longValue());
+ } else {
+ sysProjUse.setVipId(-sysProjUse.getVipId());
+ }
+
+ if (sysProjUse.getOrderItemId() != null && sysProjUse.getOrderItemId() != 1) {
+ Integer itemID = order_item.get(sysProjUse.getOrderItemId().toString());
+ if (itemID != null) {
+ sysProjUse.setOrderItemId(itemID.longValue());
+ } else {
+ sysProjUse.setOrderItemId(-sysProjUse.getOrderItemId());
+ }
+ }
+ projUses.add(sysProjUse);
}
return projUses;
}
@@ -1097,15 +1186,28 @@
if (CollUtil.isNotEmpty(list)) {
Map<Long, Long> map = new HashMap<>();
for (SysProjUse sysProjUse : list) {
- if(sysProjUse.getType() == "套餐卡") {
- sysProjUse.setType("套餐");
- } else if (StrUtil.isEmpty(sysProjUse.getType())){
- sysProjUse.setType("项目");
- }
-
Long oldId = sysProjUse.getId();
sysProjUse.setId(null);
- sysProjUseDao.insert(sysProjUse);
+ sysProjUse.setCreateBy("数据迁移");
+ sysProjUse.setTaocanId(null);
+
+ List<SysProjUse> taocanProjUses = sysProjUse.getTaocanProjUse();
+ if (CollUtil.isNotEmpty(taocanProjUses)) {
+ sysProjUse.setIsCourse("N");
+ sysProjUseDao.insert(sysProjUse);
+ for (SysProjUse taocanProjUse : taocanProjUses) {
+ taocanProjUse.setTaocanId(sysProjUse.getId());
+ Long projOldId = taocanProjUse.getId();
+ taocanProjUse.setId(null);
+ taocanProjUse.setCreateBy("数据迁移");
+ taocanProjUse.setDeductionNum(1);
+ sysProjUseDao.insert(taocanProjUse);
+ map.put(projOldId, taocanProjUse.getId());
+ }
+ } else {
+ sysProjUseDao.insert(sysProjUse);
+ }
+
map.put(oldId, sysProjUse.getId());
}
@@ -1293,6 +1395,7 @@
achieveNew.setId(null);
achieveNew.setOrderItemId(beautyMaps.get(achieveNew.getOrderItemId()));
achieveNew.setServiceOrderId(newId);
+ achieveNew.setCompanyId(companyId);
}
achieveNewDao.batchInsert(achieveNews);
}
@@ -1303,5 +1406,60 @@
}
}
+ @DS("slave")
+ public List<SysUsers> shopStaffInfoOld() throws UnsupportedEncodingException, NoSuchAlgorithmException {
+ List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_shopstaff_info");
+ Map<String, Integer> sysUsersMap = getRedisIds("sys_users");
+ Map<String, Integer> shopMap = getRedisIds("shopId");
+ Map<Long, Long> staffMap = new HashMap<>();
+
+ List<SysUsers> list = new ArrayList<>();
+ // EmptyResultDataAccessException
+ for (Map<String, Object> map : maps) {
+ try {
+ Map<String, Object> staffUser = jdbcTemplate.queryForMap("select * from users where staff_id=" + map.get("id"));
+ Integer id = sysUsersMap.get(staffUser.get("id").toString());
+ staffMap.put(Long.parseLong(map.get("id").toString()), id.longValue());
+ } catch (EmptyResultDataAccessException e) {
+ 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("N");
+ 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);
+ }
+ }
+ redisClient.saveMapValue("shop_staff", staffMap);
+ return list;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void shopStaffInfoNew(List<SysUsers> list) {
+ Map<String, Integer> shopStaff = getRedisIds("shop_staff");
+ for (SysUsers sysUsers : list) {
+ Long oldId = sysUsers.getSuId();
+ sysUsers.setSuId(null);
+ sysUsersDao.insert(sysUsers);
+ shopStaff.put(oldId.toString(), sysUsers.getSuId().intValue());
+ }
+
+ redisClient.saveMapValue("shop_staff", shopStaff);
+ }
+
}
--
Gitblit v1.9.1