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 | 910 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 892 insertions(+), 18 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 800050d..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
@@ -5,6 +5,7 @@
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;
@@ -13,7 +14,9 @@
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
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;
@@ -54,12 +57,14 @@
private ShoppingGoodsDao shoppingGoodsDao;
@Autowired
private ShoppingGoodsAssembleDao shoppingGoodsAssembleDao;
+ @Autowired
+ private MoneyCardUseDao moneyCardUseDao;
@Autowired
private RedisClient redisClient;
private Long companyId = 35L;
- private Long shopId = 38L;
+ private Long shopId = 60L;
public List<Map<String, Object>> dataMove() {
return jdbcTemplate.queryForList("select * from sys_vip_info limit 10");
@@ -99,11 +104,12 @@
return shopInfos;
}
+ @Transactional(rollbackFor = Exception.class)
public void toNewShopInfo(List<SysShopInfo> shopInfos) {
if (CollUtil.isNotEmpty(shopInfos)) {
Map<Long, Long> oldAndNewId = new HashMap<>();
for (SysShopInfo shopInfo : shopInfos) {
- if (shopInfo.getShopName().equals("总部")) {
+ if (shopInfo.getShopName().equals("总店")) {
shopInfo.setShopType(1);
shopInfo.setIsOpenNet(2);
} else {
@@ -117,14 +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 {
- 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);
}
@@ -162,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());
}
@@ -234,6 +247,7 @@
}
}
+ // sys_users 中 id 为 200 的无法找到
Long staffId = sysVipInfo.getStaffId();
if (staffId != null) {
Object o = sysUsersMap.get(staffId.toString());
@@ -487,6 +501,11 @@
shoppingGood.setIsDel(1);
shoppingGood.setZjm(StringUtils.toHanyuPinyin(shoppingGood.getName()) + "," + StringUtils.toHeadWordHanyuPinyin(shoppingGood.getName()));
+ if (shoppingGood.getCarUseCount() != null) {
+ shoppingGood.setIsCourse("Y");
+ shoppingGood.setIsInfinite("N");
+ }
+
shoppingGood.setWeiDescription("数据迁移-tc");
List<ShoppingGoodsAssemble> assembleList = mapsToListBean(assembles, ShoppingGoodsAssemble.class);
@@ -628,6 +647,7 @@
}
shoppingGood.setAssembleGoods(assembleList);
+ shoppingGood.setIsInfinite("N");
}
return shoppingGoods;
@@ -653,6 +673,20 @@
}
}
+ if ("否".equals(shoppingGoods.getIsOnce())) {
+ shoppingGoods.setIsOnce("0");
+ } else {
+ shoppingGoods.setIsOnce("1");
+ }
+
+ if (StrUtil.isNotBlank(shoppingGoods.getIsPresent())) {
+ if ("否".equals(shoppingGoods.getIsPresent())) {
+ shoppingGoods.setIsPresent("0");
+ } else {
+ shoppingGoods.setIsPresent("1");
+ }
+ }
+
Long oldId = shoppingGoods.getId();
shoppingGoods.setId(null);
shoppingGoodsDao.insert(shoppingGoods);
@@ -666,6 +700,20 @@
Long oldIdTc = assembleGood.getAssembleSkuId() == null ? assembleGood.getAssembleProjId() : assembleGood.getAssembleSkuId();
if (assembleGood.getShoppingGoods() != null) {
+
+ if ("否".equals(assembleGood.getShoppingGoods().getIsOnce())) {
+ assembleGood.getShoppingGoods().setIsOnce("0");
+ } else {
+ assembleGood.getShoppingGoods().setIsOnce("1");
+ }
+
+ if (StrUtil.isNotBlank(assembleGood.getShoppingGoods().getIsPresent())) {
+ if ("否".equals(assembleGood.getShoppingGoods().getIsPresent())) {
+ assembleGood.getShoppingGoods().setIsPresent("0");
+ } else {
+ assembleGood.getShoppingGoods().setIsPresent("1");
+ }
+ }
assembleGood.getShoppingGoods().setId(null);
shoppingGoodsDao.insert(assembleGood.getShoppingGoods());
@@ -740,6 +788,20 @@
}
}
+ if ("否".equals(shoppingGoods.getIsOnce())) {
+ shoppingGoods.setIsOnce("0");
+ } else {
+ shoppingGoods.setIsOnce("1");
+ }
+
+ if (StrUtil.isNotBlank(shoppingGoods.getIsPresent())) {
+ if ("否".equals(shoppingGoods.getIsPresent())) {
+ shoppingGoods.setIsPresent("0");
+ } else {
+ shoppingGoods.setIsPresent("1");
+ }
+ }
+
Long oldId = shoppingGoods.getId();
shoppingGoods.setId(null);
shoppingGoodsDao.insert(shoppingGoods);
@@ -775,15 +837,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 {
@@ -904,14 +971,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 {
@@ -966,6 +1033,9 @@
for (SysOrder sysOrder : list) {
Long oldOrderId = sysOrder.getId();
sysOrder.setId(null);
+ sysOrder.setCreateBy("数据迁移");
+ 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());
@@ -981,16 +1051,30 @@
if (CollUtil.isNotEmpty(sysOrder.getFlows())) {
for (SysOrderFlow flow : sysOrder.getFlows()) {
- flow.setOrderId(oldOrderId);
+ if ("储值卡".equals(flow.getPayMethod())) {
+ MoneyCardUse moneyCardUse = new MoneyCardUse();
+ moneyCardUse.setIsVipCar("Y");
+ moneyCardUse.setVipId(flow.getVipId());
+ List<MoneyCardUse> moneyCardUses = moneyCardUseDao.selectVipCardUse(moneyCardUse);
+ if (CollUtil.isNotEmpty(moneyCardUses)) {
+ flow.setCardId(moneyCardUses.get(0).getId());
+ }
+ }
+ flow.setOrderId(sysOrder.getId());
+ flow.setCreateBy("数据迁移");
+ flow.setCreateTime(sysOrder.getCreateTime());
+ flow.setUpdateTime(sysOrder.getUpdateTime());
sysOrderFlowDao.insert(flow);
}
}
if (CollUtil.isNotEmpty(sysOrder.getAchieveNews())) {
for (AchieveNew achieveNew : sysOrder.getAchieveNews()) {
- achieveNew.setOrderId(oldOrderId);
+ achieveNew.setOrderId(sysOrder.getId());
Long item = itemIds.get(achieveNew.getOrderItemId());
+ achieveNew.setT9("数据迁移");
achieveNew.setOrderItemId(item);
+ achieveNew.setId(null);
}
achieveNewDao.batchInsert(sysOrder.getAchieveNews());
@@ -1002,4 +1086,794 @@
}
}
+ @DS("slave")
+ public List<SysBedInfo> bedInfoOld() {
+ List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_bed_info");
+ List<SysBedInfo> beds = mapsToListBean(maps, SysBedInfo.class);
+
+ Map<String, Integer> shopIds = getRedisIds("shopId");
+ for (SysBedInfo bed : beds) {
+ Integer shopId = shopIds.get(bed.getShopId().toString());
+ if (shopId != null) {
+ bed.setShopId(shopId.longValue());
+ } else {
+ bed.setShopId(-bed.getShopId());
+ }
+ }
+ return beds;
+ }
+
+ @Autowired
+ private SysBedInfoDao sysBedInfoDao;
+
+ @Transactional(rollbackFor = Exception.class)
+ public void bedInfoNew(List<SysBedInfo> list) {
+ if (CollUtil.isNotEmpty(list)) {
+ Map<Long, Long> map = new HashMap<>();
+ for (SysBedInfo bed : list) {
+ Long oldId = bed.getId();
+ bed.setId(null);
+ sysBedInfoDao.insert(bed);
+ map.put(oldId, bed.getId());
+ }
+
+ redisClient.saveMapValue("bed_info", map);
+ }
+ }
+
+ @DS("slave")
+ public List<SysProjUse> projUseMoveOld() {
+ 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" +
+ " a.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.setProjId(tcId.longValue());
+ } else {
+ projUse.setProjId(-projUse.getTaocanId());
+ }
+ }
+
+ Integer vipId = vipInfos.get(projUse.getVipId().toString());
+ if (vipId != null) {
+ projUse.setVipId(vipId.longValue());
+ } 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;
+ }
+
+ @Autowired
+ private SysProjUseDao sysProjUseDao;
+
+ @Transactional(rollbackFor = Exception.class)
+ public void projUseNew(List<SysProjUse> list) {
+ if (CollUtil.isNotEmpty(list)) {
+ Map<Long, Long> map = new HashMap<>();
+ for (SysProjUse sysProjUse : list) {
+ Long oldId = sysProjUse.getId();
+ sysProjUse.setId(null);
+ 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());
+ }
+
+ redisClient.saveMapValue("proj_use", map);
+ }
+ }
+
+ @DS("slave")
+ public List<SysProjServices> serviceOrderOld() {
+ List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_proj_services");
+ List<SysProjServices> list = mapsToListBean(maps, SysProjServices.class);
+
+
+ Map<String, Integer> vipInfos = getRedisIds("vip_info");
+ Map<String, Integer> bedInfos = getRedisIds("bed_info");
+// Map<String, Integer> sysUsers = getRedisIds("sys_users");
+ Map<String, Integer> projUses = getRedisIds("proj_use");
+ Map<String, Integer> goodProj = getRedisIds("shopping_goods_proj");
+ Map<String, Integer> shopIds = getRedisIds("shopId");
+ Map<String, Integer> shopStaff = getRedisIds("shop_staff");
+ for (SysProjServices sysProjServices : list) {
+ List<Map<String, Object>> beauticiansMap = jdbcTemplate.queryForList("select * from sys_beautician_state where SERVICES_ID=" + sysProjServices.getId());
+// Map<String, Object> bedStatesMap = jdbcTemplate.queryForMap("select * from sys_bed_state where SERVICE_ID=" + sysProjServices.getId());
+// List<Map<String, Object>> achieveMaps = jdbcTemplate.queryForList("select * from achieve_new where service_order_id=" + sysProjServices.getId());
+
+
+ SysBedState query = new SysBedState();
+ query.setServiceId(sysProjServices.getId());
+ List<SysBedState> queryBeds = sysBedStateDao.selectByModel(query);
+ SysBedState bedStates = null;
+ if (CollUtil.isNotEmpty(queryBeds)) {
+ bedStates = queryBeds.get(0);
+ }
+ List<SysBeauticianState> beauticians = mapsToListBean(beauticiansMap, SysBeauticianState.class);
+ List<AchieveNew> achieveNews = achieveNewDao.selectAchieveByServiceOrderId(sysProjServices.getId());
+// SysBedState bedStates = mapToBane(bedStatesMap, SysBedState.class);
+
+ Integer shopId = shopIds.get(sysProjServices.getShopId().toString());
+ if (shopId != null) {
+ sysProjServices.setShopId(shopId.longValue());
+ } else {
+ sysProjServices.setShopId(-sysProjServices.getShopId());
+ }
+
+ if (sysProjServices.getBedId() != null) {
+ Integer bedId = bedInfos.get(sysProjServices.getBedId().toString());
+ if (bedId != null) {
+ sysProjServices.setBedId(bedId.longValue());
+ bedStates.setBedId(bedId.longValue());
+ } else {
+ sysProjServices.setBedId(-sysProjServices.getBedId());
+ bedStates.setBedId(-sysProjServices.getBedId());
+ }
+ sysProjServices.setBedState(bedStates);
+ }
+
+ if (sysProjServices.getBeauticianId() != null) {
+ Integer beautyId = shopStaff.get(sysProjServices.getBeauticianId().toString());
+ if (beautyId != null) {
+ sysProjServices.setBeauticianId(beautyId.longValue());
+ } else {
+ sysProjServices.setBeauticianId(-sysProjServices.getBeauticianId());
+ }
+ }
+
+ if (sysProjServices.getDevisionId() != null) {
+ Integer devisionId = shopStaff.get(sysProjServices.getDevisionId().toString());
+ if (devisionId != null) {
+ sysProjServices.setDevisionId(devisionId.longValue());
+ } else {
+ sysProjServices.setDevisionId(-sysProjServices.getDevisionId());
+ }
+ }
+
+ if (sysProjServices.getCreateStaffId() != null) {
+ Integer staffId = shopStaff.get(sysProjServices.getCreateStaffId().toString());
+ if (staffId != null) {
+ sysProjServices.setCreateStaffId(staffId.longValue());
+ } else {
+ sysProjServices.setCreateStaffId(-sysProjServices.getCreateStaffId());
+ }
+ }
+ Integer vipId = null;
+ if (sysProjServices.getVipId() != null) {
+ vipId = vipInfos.get(sysProjServices.getVipId().toString());
+ if (vipId != null) {
+ sysProjServices.setVipId(vipId.longValue());
+ } else {
+ sysProjServices.setVipId(-sysProjServices.getVipId());
+ }
+ }
+
+ if (CollUtil.isNotEmpty(beauticians)) {
+ List<SysBeauticianState> newBeautician = new ArrayList<>();
+ for (SysBeauticianState beautician : beauticians) {
+ List<Map<String, Object>> beaProjMaps = jdbcTemplate.queryForList("select distinct proj_id from service_bea_proj where ser_proj_id is not null and bea_state_id=" + beautician.getId());
+ for (Map<String, Object> beaProjMap : beaProjMaps) {
+ SysBeauticianState beauticianState = new SysBeauticianState();
+ BeanUtils.copyProperties(beautician, beauticianState);
+ String puseIdStr = beaProjMap.get("proj_id").toString();
+ Integer puseId = projUses.get(puseIdStr);
+ beauticianState.setPuseId(puseId != null ? puseId.longValue() : -Long.parseLong(puseIdStr));
+
+ SysProjUse sysProjUse = sysProjUseDao.selectById(Long.parseLong(puseIdStr));
+// Map<String, Object> projUseMap = jdbcTemplate.queryForMap("select * from sys_proj_use where id=" + puseIdStr);
+ if (sysProjUse != null) {
+ Integer goodsProjId = goodProj.get(sysProjUse.getProjId().toString());
+ beauticianState.setProjId(goodsProjId != null ? goodsProjId.longValue() : -Long.parseLong(sysProjUse.getProjId().toString()));
+ }
+
+ beauticianState.setCount(1);
+// beauticianState.setcreate("数据迁移");
+ newBeautician.add(beauticianState);
+ }
+ }
+ sysProjServices.setServiceItems(newBeautician);
+ }
+
+ if (CollUtil.isNotEmpty(achieveNews)) {
+ for (AchieveNew achieveNew : achieveNews) {
+ achieveNew.setShopId(shopId != null ? shopId.longValue() : -achieveNew.getShopId());
+ achieveNew.setVipId(vipId != null ? vipId.longValue() : -achieveNew.getVipId());
+
+ Integer saleIdInt = shopStaff.get(achieveNew.getSaleId() == null ? "" : achieveNew.getSaleId().toString());
+ achieveNew.setSaleId(saleIdInt == null ? -achieveNew.getSaleId() : saleIdInt);
+
+ Integer beaultyIdInt = shopStaff.get(achieveNew.getBeaultId() == null ? "" : achieveNew.getBeaultId().toString());
+ achieveNew.setBeaultId(beaultyIdInt == null ? -achieveNew.getBeaultId() : beaultyIdInt);
+
+ if (achieveNew.getShoppingGoodsId() != null) {
+ Integer goodsId = goodProj.get(achieveNew.getShoppingGoodsId().toString());
+ achieveNew.setShoppingGoodsId(goodsId == null ? -achieveNew.getShoppingGoodsId() : goodsId.longValue());
+ }
+
+ achieveNew.setT9("数据迁移");
+ }
+ }
+ sysProjServices.setAchieveNews(achieveNews);
+
+ }
+
+
+ return list;
+ }
+
+ @Autowired
+ private SysProjServicesDao sysProjServicesDao;
+ @Autowired
+ private SysBeauticianStateDao sysBeauticianStateDao;
+ @Autowired
+ private SysBedStateDao sysBedStateDao;
+
+ @Transactional(rollbackFor = Exception.class)
+ public void serviceOrderNew(List<SysProjServices> list) {
+ if (CollUtil.isNotEmpty(list)) {
+ Map<Long, Long> maps = new HashMap<>();
+ Map<Long, Long> beautyMaps = new HashMap<>();
+ for (SysProjServices sysProjServices : list) {
+ Long oldId = sysProjServices.getId();
+ sysProjServices.setId(null);
+ sysProjServices.setComment("数据迁移");
+ sysProjServices.setCompanyId(companyId);
+ sysProjServicesDao.insert(sysProjServices);
+ Long newId = sysProjServices.getId();
+ List<SysBeauticianState> serviceItems = sysProjServices.getServiceItems();
+ if (CollUtil.isNotEmpty(serviceItems)) {
+ for (SysBeauticianState serviceItem : serviceItems) {
+ serviceItem.setServicesId(newId);
+ Long beautyOldId = serviceItem.getId();
+ serviceItem.setId(null);
+// serviceItem.setExtract("数据迁移");
+ sysBeauticianStateDao.insert(serviceItem);
+ beautyMaps.put(beautyOldId, serviceItem.getId());
+ }
+ }
+ SysBedState bedState = sysProjServices.getBedState();
+ if (bedState != null) {
+ bedState.setId(null);
+ bedState.setServiceId(newId);
+ sysBedStateDao.insert(bedState);
+ }
+
+ List<AchieveNew> achieveNews = sysProjServices.getAchieveNews();
+ if (CollUtil.isNotEmpty(achieveNews)) {
+ for (AchieveNew achieveNew : achieveNews) {
+ achieveNew.setId(null);
+ achieveNew.setOrderItemId(beautyMaps.get(achieveNew.getOrderItemId()));
+ achieveNew.setServiceOrderId(newId);
+ achieveNew.setCompanyId(companyId);
+ }
+ achieveNewDao.batchInsert(achieveNews);
+ }
+ maps.put(oldId, newId);
+ }
+
+ redisClient.saveMapValue("service_order", maps);
+ }
+ }
+
+ @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);
+ }
+
+ @DS("slave")
+ public List<MoneyCardUse> moneyCardUseOld() {
+ List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from money_card_use");
+ List<MoneyCardUse> moneyCardUses = mapsToListBean(maps, MoneyCardUse.class);
+
+ Map<String, Integer> goodCzk = getRedisIds("shopping_goods_czk");
+ Map<String, Integer> vipInfos = getRedisIds("vip_info");
+ for (MoneyCardUse moneyCardUse : moneyCardUses) {
+ moneyCardUse.setIsVipCar("N");
+
+ ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(moneyCardUse.getGoodsId());
+ if (shoppingGoods != null)
+ { moneyCardUse.setCardName(shoppingGoods.getName());}
+
+ Integer vipId = null;
+ if (moneyCardUse.getVipId() != null) {
+ vipId = vipInfos.get(moneyCardUse.getVipId().toString());
+ if (vipId != null) {
+ moneyCardUse.setVipId(vipId.longValue());
+ } else {
+ moneyCardUse.setVipId(-moneyCardUse.getVipId());
+ }
+ }
+
+ if (moneyCardUse.getGoodsId() != null) {
+ Integer goodsId = goodCzk.get(moneyCardUse.getGoodsId().toString());
+ if (goodsId != null) {
+ moneyCardUse.setGoodsId(goodsId.longValue());
+ } else {
+ moneyCardUse.setGoodsId(-moneyCardUse.getGoodsId());
+ }
+ }
+ }
+
+ return moneyCardUses;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void moneyCardUseNew(List<MoneyCardUse> list) {
+ if (CollUtil.isNotEmpty(list)) {
+ for (MoneyCardUse moneyCardUse : list) {
+ moneyCardUse.setId(null);
+ moneyCardUse.setSource("美度-数据迁移");
+ moneyCardUseDao.insert(moneyCardUse);
+ }
+ }
+ }
+
+
+ @Transactional(rollbackFor = Exception.class)
+ public void tyOrderAndAchieveMove() {
+ jdbcTemplate.update("update sys_order set orderType=1, is_has_refund=2 where 1=1");
+
+ List<SysOrderFlow> flows = sysOrderFlowDao.selectOrderFlowByType();
+ if (CollUtil.isNotEmpty(flows)) {
+ for (SysOrderFlow flow : flows) {
+ SysOrder sysOrder = sysOrderDao.selectById(flow.getOrderId());
+ sysOrder.setIsHasRefund(1);
+ sysOrderDao.update(sysOrder);
+ }
+ }
+
+ List<AchieveNew> achieveNews = achieveNewDao.selectAchieveForOrder();
+ if (CollUtil.isNotEmpty(achieveNews)) {
+ for (AchieveNew achieveNew : achieveNews) {
+ if ("现金业绩".equalsIgnoreCase(achieveNew.getAchieveType())) {
+ achieveNew.setPayMethod("现金");
+ } else {
+ achieveNew.setPayMethod("划扣");
+ }
+
+// if (achieveNew.getConsume() == null) {
+// achieveNew.setPayMethod("现金");
+// } else {
+// achieveNew.setPayMethod("划扣");
+// }
+ achieveNew.setAchieveType("顾问业绩");
+ achieveNew.setGoodsCash(Double.parseDouble(achieveNew.getT1()));
+ achieveNewDao.updateByModel(achieveNew);
+ }
+
+ }
+
+ }
+
+
+ @DS("slave")
+ public Map<String, List<Long>> roleOld() {
+ List<Map<String, Object>> maps = jdbcTemplate.queryForList("select a.id, a.name, a.role_id, b.role_name from users a inner join sys_role b on find_in_set(b.role_id, a.role_id)");
+
+ List<Long> jkgw = new ArrayList<>();
+ List<Long> mls = new ArrayList<>();
+ for (Map<String, Object> map : maps) {
+ String roleName = map.get("role_name").toString();
+
+ if ("健康顾问".equals(roleName)) {
+ jkgw.add((Long) map.get("id"));
+ } else {
+ mls.add((Long) map.get("id"));
+ }
+ }
+
+ Map<String, List<Long>> result = new HashMap<>();
+ result.put("jkgw", jkgw);
+ result.put("mls", mls);
+ return result;
+ }
+
+ public void roleNew(Map<String, List<Long>> role) {
+ List<Long> jkgw = role.get("jkgw");
+ List<Long> mls = role.get("mls");
+ Map<String, Integer> sysUsersMap = getRedisIds("sys_users");
+
+ for (Long aLong : jkgw) {
+ Integer id = sysUsersMap.get(aLong.toString());
+ SysUsers sysUsers = new SysUsers();
+ sysUsers.setSuId(id.longValue());
+ sysUsers.setRoleIds("56");
+ sysUsersDao.updateByModel(sysUsers);
+ }
+
+ for (Long ml : mls) {
+ Integer id = sysUsersMap.get(ml.toString());
+ SysUsers sysUsers = new SysUsers();
+ sysUsers.setSuId(id.longValue());
+ sysUsers.setRoleIds("55");
+ sysUsersDao.updateByModel(sysUsers);
+ }
+
+ }
+
+ @DS("slave")
+ public Map<String, String> roleOld2() {
+ List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_shopstaff_info where find_in_set('美疗师', POST_TYPE_NAME) or find_in_set('健康顾问', POST_TYPE_NAME)");
+ Map<String, String> result = new HashMap<>();
+ for (Map<String, Object> map : maps) {
+
+ result.put(map.get("id").toString(), map.get("POST_TYPE_NAME").toString());
+ }
+
+ return result;
+ }
+
+ public void roleNew2(Map<String, String> map) {
+
+ Map<String, Integer> shopStaff = getRedisIds("shop_staff");
+ for (Map.Entry<String, String> entry : map.entrySet()) {
+ String id = entry.getKey();
+ Integer newId = shopStaff.get(id);
+
+ SysUsers sysUsers = new SysUsers();
+ sysUsers.setSuId(newId.longValue());
+ if (entry.getValue().contains("健康顾问,")) {
+ sysUsers.setRoleIds("56");
+ }
+
+ if (entry.getValue().contains("美疗师,")) {
+ sysUsers.setRoleIds("55");
+ }
+
+ if (entry.getValue().contains("健康顾问,美疗师,")) {
+ sysUsers.setRoleIds("55,56");
+ }
+
+ sysUsersDao.updateByModel(sysUsers);
+ }
+ }
+
+ public void updateServiceOrderStaff() {
+ Map<String, Integer> shopStaff = getRedisIds("shop_staff");
+
+ List<SysBeauticianState> sysBeauticianStates = sysBeauticianStateDao.selectByModel(null);
+ for (SysBeauticianState state : sysBeauticianStates) {
+ Long staffId = state.getStaffId();
+
+ if (staffId == null) {
+ continue;
+ }
+ Integer integer = shopStaff.get(staffId.toString());
+
+ if (integer == null) {
+ state.setStaffId(-staffId);
+ } else {
+ state.setStaffId(integer.longValue());
+ }
+ 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