迁移 用户-店铺-员工
This commit is contained in:
parent
ba4573eee0
commit
d75630b812
|
|
@ -4,9 +4,11 @@ import cn.hutool.core.date.DateUtil;
|
|||
import cn.hutool.crypto.SecureUtil;
|
||||
import com.czg.mergedata.common.resp.CzgResult;
|
||||
import com.czg.mergedata.common.utils.PageUtils;
|
||||
import com.czg.mergedata.cur.entity.*;
|
||||
import com.czg.mergedata.cur.entity.CurShopInfo;
|
||||
import com.czg.mergedata.cur.entity.CurShopStaff;
|
||||
import com.czg.mergedata.cur.entity.CurStaffIdRelation;
|
||||
import com.czg.mergedata.cur.entity.CurSysUser;
|
||||
import com.czg.mergedata.cur.mapper.*;
|
||||
import com.czg.mergedata.cur.service.CurShopIdRelationService;
|
||||
import com.czg.mergedata.cur.service.CurShopInfoService;
|
||||
import com.czg.mergedata.cur.service.CurShopStaffService;
|
||||
import com.czg.mergedata.cur.service.CurSysUserService;
|
||||
|
|
@ -67,9 +69,6 @@ public class CurSysUserServiceImpl extends ServiceImpl<CurSysUserMapper, CurSysU
|
|||
@Resource
|
||||
private CurShopStaffService curStaffService;
|
||||
|
||||
@Resource
|
||||
private CurShopIdRelationService shopIdRelationService;
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public CzgResult<String> mergeShopInfo() {
|
||||
|
|
@ -80,23 +79,6 @@ public class CurSysUserServiceImpl extends ServiceImpl<CurSysUserMapper, CurSysU
|
|||
curShopIdRelationMapper.truncateTable();
|
||||
curStaffIdRelationMapper.truncateTable();
|
||||
|
||||
// 账号和店铺id映射
|
||||
Map<String, Long> orginAccountAndShopIdMap = new HashMap<>();
|
||||
|
||||
// 老新系统店铺 id 映射
|
||||
Map<Long, Long> oldAndCurShopIdMap = new HashMap<>();
|
||||
Map<Long, Long> curAndOldShopIdMap = new HashMap<>();
|
||||
|
||||
// List<CurSysUser> curSysUsers = execShopSysUser();
|
||||
// curSysUsers.forEach(curSysUser -> {
|
||||
// if (!curSysUser.getAccount().contains("@")) {
|
||||
// orginAccountAndShopIdMap.put(curSysUser.getAccount(), curSysUser.getId());
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// execShopInfo(orginAccountAndShopIdMap, oldAndCurShopIdMap, curAndOldShopIdMap);
|
||||
// execStaffInfo(oldAndCurShopIdMap, curAndOldShopIdMap);
|
||||
|
||||
execSysUserFromShopInfo();
|
||||
execStaffInfo();
|
||||
updateCurlShopBindInfo();
|
||||
|
|
|
|||
Loading…
Reference in New Issue