From 3fd6e55be5b9f5013c437529f035ea4383dd98ca Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Mar 2021 14:29:48 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 303 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 297 insertions(+), 6 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 f0ad77f..c6ccb3d 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
@@ -13,7 +13,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,6 +56,8 @@
private ShoppingGoodsDao shoppingGoodsDao;
@Autowired
private ShoppingGoodsAssembleDao shoppingGoodsAssembleDao;
+ @Autowired
+ private MoneyCardUseDao moneyCardUseDao;
@Autowired
private RedisClient redisClient;
@@ -775,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 {
@@ -904,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 {
@@ -981,16 +990,28 @@
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("数据迁移");
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());
@@ -1074,4 +1095,274 @@
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) {
+ if(sysProjUse.getType() == "套餐卡") {
+ sysProjUse.setType("套餐");
+ } else if (StrUtil.isEmpty(sysProjUse.getType())){
+ sysProjUse.setType("项目");
+ }
+
+ Long oldId = sysProjUse.getId();
+ sysProjUse.setId(null);
+ 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");
+ 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 = sysUsers.get(sysProjServices.getBeauticianId().toString());
+ if (beautyId != null) {
+ sysProjServices.setBeauticianId(beautyId.longValue());
+ } else {
+ sysProjServices.setBeauticianId(-sysProjServices.getBeauticianId());
+ }
+ }
+
+ if (sysProjServices.getDevisionId() != null) {
+ Integer devisionId = sysUsers.get(sysProjServices.getDevisionId().toString());
+ if (devisionId != null) {
+ sysProjServices.setDevisionId(devisionId.longValue());
+ } else {
+ sysProjServices.setDevisionId(-sysProjServices.getDevisionId());
+ }
+ }
+
+ if (sysProjServices.getCreateStaffId() != null) {
+ Integer staffId = sysUsers.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.setExtract("数据迁移");
+ 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 = sysUsers.get(achieveNew.getSaleId() == null ? "" : achieveNew.getSaleId().toString());
+ achieveNew.setSaleId(saleIdInt == null ? -achieveNew.getSaleId() : saleIdInt);
+
+ Integer beaultyIdInt = sysUsers.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);
+ }
+ 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);
+ }
+
+
}
--
Gitblit v1.9.1