From a0cd34acf14a149cc3c08b41ca4dde6938a29ecc Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Wed, 07 Jul 2021 22:31:34 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 316 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 285 insertions(+), 31 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..ae12e32 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;
@@ -15,6 +16,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;
@@ -106,7 +108,7 @@
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 {
@@ -125,6 +127,9 @@
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());
}
@@ -490,6 +495,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);
@@ -631,6 +641,7 @@
}
shoppingGood.setAssembleGoods(assembleList);
+ shoppingGood.setIsInfinite("N");
}
return shoppingGoods;
@@ -778,15 +789,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 +923,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 {
@@ -969,6 +985,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());
@@ -995,6 +1014,8 @@
}
flow.setOrderId(sysOrder.getId());
flow.setCreateBy("数据迁移");
+ flow.setCreateTime(sysOrder.getCreateTime());
+ flow.setUpdateTime(sysOrder.getUpdateTime());
sysOrderFlowDao.insert(flow);
}
}
@@ -1054,28 +1075,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" +
+ " 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.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 +1117,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 +1201,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());
}
@@ -1121,10 +1238,11 @@
Map<String, Integer> vipInfos = getRedisIds("vip_info");
Map<String, Integer> bedInfos = getRedisIds("bed_info");
- Map<String, Integer> sysUsers = getRedisIds("sys_users");
+// 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());
@@ -1162,7 +1280,7 @@
}
if (sysProjServices.getBeauticianId() != null) {
- Integer beautyId = sysUsers.get(sysProjServices.getBeauticianId().toString());
+ Integer beautyId = shopStaff.get(sysProjServices.getBeauticianId().toString());
if (beautyId != null) {
sysProjServices.setBeauticianId(beautyId.longValue());
} else {
@@ -1171,7 +1289,7 @@
}
if (sysProjServices.getDevisionId() != null) {
- Integer devisionId = sysUsers.get(sysProjServices.getDevisionId().toString());
+ Integer devisionId = shopStaff.get(sysProjServices.getDevisionId().toString());
if (devisionId != null) {
sysProjServices.setDevisionId(devisionId.longValue());
} else {
@@ -1180,7 +1298,7 @@
}
if (sysProjServices.getCreateStaffId() != null) {
- Integer staffId = sysUsers.get(sysProjServices.getCreateStaffId().toString());
+ Integer staffId = shopStaff.get(sysProjServices.getCreateStaffId().toString());
if (staffId != null) {
sysProjServices.setCreateStaffId(staffId.longValue());
} else {
@@ -1216,7 +1334,7 @@
}
beauticianState.setCount(1);
- beauticianState.setExtract("数据迁移");
+// beauticianState.setcreate("数据迁移");
newBeautician.add(beauticianState);
}
}
@@ -1228,10 +1346,10 @@
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());
+ Integer saleIdInt = shopStaff.get(achieveNew.getSaleId() == null ? "" : achieveNew.getSaleId().toString());
achieveNew.setSaleId(saleIdInt == null ? -achieveNew.getSaleId() : saleIdInt);
- Integer beaultyIdInt = sysUsers.get(achieveNew.getBeaultId() == null ? "" : achieveNew.getBeaultId().toString());
+ Integer beaultyIdInt = shopStaff.get(achieveNew.getBeaultId() == null ? "" : achieveNew.getBeaultId().toString());
achieveNew.setBeaultId(beaultyIdInt == null ? -achieveNew.getBeaultId() : beaultyIdInt);
if (achieveNew.getShoppingGoodsId() != null) {
@@ -1293,6 +1411,7 @@
achieveNew.setId(null);
achieveNew.setOrderItemId(beautyMaps.get(achieveNew.getOrderItemId()));
achieveNew.setServiceOrderId(newId);
+ achieveNew.setCompanyId(companyId);
}
achieveNewDao.batchInsert(achieveNews);
}
@@ -1303,5 +1422,140 @@
}
}
+ @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");
+
+ 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);
+ }
+
+ }
+
+ }
}
--
Gitblit v1.9.1