From a78d0583053acaa4edfd6ed6abde379786708408 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 10 Jul 2021 14:18:55 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 395 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 358 insertions(+), 37 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 c6ccb3d..9856f9c 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;
@@ -103,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 {
@@ -121,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);
}
@@ -166,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());
}
@@ -238,6 +247,7 @@
}
}
+ // sys_users 中 id 为 200 的无法找到
Long staffId = sysVipInfo.getStaffId();
if (staffId != null) {
Object o = sysUsersMap.get(staffId.toString());
@@ -491,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);
@@ -632,6 +647,7 @@
}
shoppingGood.setAssembleGoods(assembleList);
+ shoppingGood.setIsInfinite("N");
}
return shoppingGoods;
@@ -657,6 +673,18 @@
}
}
+ if ("否".equals(shoppingGoods.getIsOnce())) {
+ shoppingGoods.setIsOnce("0");
+ } else {
+ shoppingGoods.setIsOnce("1");
+ }
+
+ if ("否".equals(shoppingGoods.getIsPresent())) {
+ shoppingGoods.setIsPresent("0");
+ } else {
+ shoppingGoods.setIsPresent("1");
+ }
+
Long oldId = shoppingGoods.getId();
shoppingGoods.setId(null);
shoppingGoodsDao.insert(shoppingGoods);
@@ -670,6 +698,18 @@
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 ("否".equals(assembleGood.getShoppingGoods().getIsPresent())) {
+ assembleGood.getShoppingGoods().setIsPresent("0");
+ } else {
+ assembleGood.getShoppingGoods().setIsPresent("1");
+ }
assembleGood.getShoppingGoods().setId(null);
shoppingGoodsDao.insert(assembleGood.getShoppingGoods());
@@ -742,6 +782,18 @@
if (cateId != null) {
shoppingGoods.setCateId(Long.parseLong(cateId.toString()));
}
+ }
+
+ if ("否".equals(shoppingGoods.getIsOnce())) {
+ shoppingGoods.setIsOnce("0");
+ } else {
+ shoppingGoods.setIsOnce("1");
+ }
+
+ if ("否".equals(shoppingGoods.getIsPresent())) {
+ shoppingGoods.setIsPresent("0");
+ } else {
+ shoppingGoods.setIsPresent("1");
}
Long oldId = shoppingGoods.getId();
@@ -975,6 +1027,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 +1056,8 @@
}
flow.setOrderId(sysOrder.getId());
flow.setCreateBy("数据迁移");
+ flow.setCreateTime(sysOrder.getCreateTime());
+ flow.setUpdateTime(sysOrder.getUpdateTime());
sysOrderFlowDao.insert(flow);
}
}
@@ -1060,28 +1117,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());
}
}
@@ -1091,6 +1159,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;
}
@@ -1103,15 +1243,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());
}
@@ -1127,10 +1280,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());
@@ -1168,7 +1322,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 {
@@ -1177,7 +1331,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 {
@@ -1186,7 +1340,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 {
@@ -1222,7 +1376,7 @@
}
beauticianState.setCount(1);
- beauticianState.setExtract("数据迁移");
+// beauticianState.setcreate("数据迁移");
newBeautician.add(beauticianState);
}
}
@@ -1234,10 +1388,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) {
@@ -1299,6 +1453,7 @@
achieveNew.setId(null);
achieveNew.setOrderItemId(beautyMaps.get(achieveNew.getOrderItemId()));
achieveNew.setServiceOrderId(newId);
+ achieveNew.setCompanyId(companyId);
}
achieveNewDao.batchInsert(achieveNews);
}
@@ -1364,5 +1519,171 @@
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);
+ }
+
+ }
+
+ }
+
+
+ @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);
+ }
+ }
}
--
Gitblit v1.9.1