From 73f21507e7647fa46d90debec38b945113d2357c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 09 Jul 2021 10:58:43 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 121 +++++++++++++++++++++++++++++++++++++---
1 files changed, 111 insertions(+), 10 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 086cf75..68f1701 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;
@@ -107,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 {
@@ -126,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());
}
@@ -173,12 +177,13 @@
}
@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());
}
@@ -238,6 +243,7 @@
}
}
+ // sys_users 中 id 为 200 的无法找到
Long staffId = sysVipInfo.getStaffId();
if (staffId != null) {
Object o = sysUsersMap.get(staffId.toString());
@@ -491,6 +497,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);
@@ -632,6 +643,7 @@
}
shoppingGood.setAssembleGoods(assembleList);
+ shoppingGood.setIsInfinite("N");
}
return shoppingGoods;
@@ -975,6 +987,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());
@@ -1001,6 +1016,8 @@
}
flow.setOrderId(sysOrder.getId());
flow.setCreateBy("数据迁移");
+ flow.setCreateTime(sysOrder.getCreateTime());
+ flow.setUpdateTime(sysOrder.getUpdateTime());
sysOrderFlowDao.insert(flow);
}
}
@@ -1073,7 +1090,7 @@
"\t\ta.balance,\n" +
"\t\ta.remark,\n" +
" b.name projName,\n" +
- " sum(a.SURPLUS_COUNT) SURPLUS_COUNT\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" +
@@ -1223,10 +1240,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());
@@ -1264,7 +1282,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 {
@@ -1273,7 +1291,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 {
@@ -1282,7 +1300,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 {
@@ -1318,7 +1336,7 @@
}
beauticianState.setCount(1);
- beauticianState.setExtract("数据迁移");
+// beauticianState.setcreate("数据迁移");
newBeautician.add(beauticianState);
}
}
@@ -1330,10 +1348,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) {
@@ -1461,5 +1479,88 @@
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());
+ 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);
+ }
+
+ }
+
+ }
}
--
Gitblit v1.9.1