fix: 🚀解决排序问题
This commit is contained in:
@@ -69,9 +69,7 @@ import org.springframework.stereotype.Service;
|
|||||||
* @since 2024-03-30
|
* @since 2024-03-30
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoMapper, PlayClerkUserInfoEntity>
|
public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoMapper, PlayClerkUserInfoEntity> implements IPlayClerkUserInfoService {
|
||||||
implements
|
|
||||||
IPlayClerkUserInfoService {
|
|
||||||
|
|
||||||
private static final String OFFBOARD_MESSAGE = "你已离职,需要复职请联系店铺管理员";
|
private static final String OFFBOARD_MESSAGE = "你已离职,需要复职请联系店铺管理员";
|
||||||
private static final String DELISTED_MESSAGE = "你已被下架,没有权限访问";
|
private static final String DELISTED_MESSAGE = "你已被下架,没有权限访问";
|
||||||
@@ -131,8 +129,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
MPJLambdaWrapper<PlayClerkUserInfoEntity> lambdaWrapper = new MPJLambdaWrapper<>();
|
MPJLambdaWrapper<PlayClerkUserInfoEntity> lambdaWrapper = new MPJLambdaWrapper<>();
|
||||||
lambdaWrapper.selectAll(PlayClerkLevelInfoEntity.class);
|
lambdaWrapper.selectAll(PlayClerkLevelInfoEntity.class);
|
||||||
lambdaWrapper.selectAs(PlayClerkUserInfoEntity::getLevelId, "levelId");
|
lambdaWrapper.selectAs(PlayClerkUserInfoEntity::getLevelId, "levelId");
|
||||||
lambdaWrapper.leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId,
|
lambdaWrapper.leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId, PlayClerkUserInfoEntity::getLevelId);
|
||||||
PlayClerkUserInfoEntity::getLevelId);
|
|
||||||
lambdaWrapper.eq(PlayClerkUserInfoEntity::getId, clerkId);
|
lambdaWrapper.eq(PlayClerkUserInfoEntity::getId, clerkId);
|
||||||
PlayClerkLevelInfoEntity levelInfo = this.baseMapper.selectJoinOne(PlayClerkLevelInfoEntity.class, lambdaWrapper);
|
PlayClerkLevelInfoEntity levelInfo = this.baseMapper.selectJoinOne(PlayClerkLevelInfoEntity.class, lambdaWrapper);
|
||||||
if (levelInfo != null) {
|
if (levelInfo != null) {
|
||||||
@@ -157,8 +154,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
/**
|
/**
|
||||||
* 查询店员
|
* 查询店员
|
||||||
*
|
*
|
||||||
* @param id
|
* @param id 店员主键
|
||||||
* 店员主键
|
|
||||||
* @return 店员
|
* @return 店员
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@@ -173,13 +169,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
@Override
|
@Override
|
||||||
public PlayClerkUserLoginResponseVo getVo(PlayClerkUserInfoEntity userInfo) {
|
public PlayClerkUserLoginResponseVo getVo(PlayClerkUserInfoEntity userInfo) {
|
||||||
PlayClerkUserLoginResponseVo result = ConvertUtil.entityToVo(userInfo, PlayClerkUserLoginResponseVo.class);
|
PlayClerkUserLoginResponseVo result = ConvertUtil.entityToVo(userInfo, PlayClerkUserLoginResponseVo.class);
|
||||||
List<PlayClerkDataReviewInfoEntity> pendingReviews = playClerkDataReviewInfoService
|
List<PlayClerkDataReviewInfoEntity> pendingReviews = playClerkDataReviewInfoService.queryByClerkId(userInfo.getId(), "0");
|
||||||
.queryByClerkId(userInfo.getId(), "0");
|
|
||||||
if (pendingReviews != null && !pendingReviews.isEmpty()) {
|
if (pendingReviews != null && !pendingReviews.isEmpty()) {
|
||||||
Set<String> pendingTypes = pendingReviews.stream()
|
Set<String> pendingTypes = pendingReviews.stream().map(PlayClerkDataReviewInfoEntity::getDataType).filter(StrUtil::isNotBlank).collect(Collectors.toSet());
|
||||||
.map(PlayClerkDataReviewInfoEntity::getDataType)
|
|
||||||
.filter(StrUtil::isNotBlank)
|
|
||||||
.collect(Collectors.toSet());
|
|
||||||
if (pendingTypes.contains("0")) {
|
if (pendingTypes.contains("0")) {
|
||||||
result.setNicknameAllowEdit(false);
|
result.setNicknameAllowEdit(false);
|
||||||
}
|
}
|
||||||
@@ -217,12 +209,10 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 查询店员服务项目
|
// 查询店员服务项目
|
||||||
List<PlayClerkCommodityEntity> clerkCommodityEntities = playClerkCommodityService
|
List<PlayClerkCommodityEntity> clerkCommodityEntities = playClerkCommodityService.selectCommodityTypeByUser(userInfo.getId(), "");
|
||||||
.selectCommodityTypeByUser(userInfo.getId(), "");
|
|
||||||
List<PlayClerkCommodityQueryVo> playClerkCommodityQueryVos = new ArrayList<>();
|
List<PlayClerkCommodityQueryVo> playClerkCommodityQueryVos = new ArrayList<>();
|
||||||
for (PlayClerkCommodityEntity clerkCommodityEntity : clerkCommodityEntities) {
|
for (PlayClerkCommodityEntity clerkCommodityEntity : clerkCommodityEntities) {
|
||||||
playClerkCommodityQueryVos.add(new PlayClerkCommodityQueryVo(clerkCommodityEntity.getCommodityName(),
|
playClerkCommodityQueryVos.add(new PlayClerkCommodityQueryVo(clerkCommodityEntity.getCommodityName(), clerkCommodityEntity.getEnablingState()));
|
||||||
clerkCommodityEntity.getEnablingState()));
|
|
||||||
}
|
}
|
||||||
result.setCommodity(playClerkCommodityQueryVos);
|
result.setCommodity(playClerkCommodityQueryVos);
|
||||||
result.setArea(userInfo.getProvince() + "-" + userInfo.getCity());
|
result.setArea(userInfo.getProvince() + "-" + userInfo.getCity());
|
||||||
@@ -265,10 +255,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
if (StrUtil.isBlank(clerkId)) {
|
if (StrUtil.isBlank(clerkId)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
LambdaUpdateWrapper<PlayClerkUserInfoEntity> wrapper = Wrappers.lambdaUpdate(PlayClerkUserInfoEntity.class)
|
LambdaUpdateWrapper<PlayClerkUserInfoEntity> wrapper = Wrappers.lambdaUpdate(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getId, clerkId).set(PlayClerkUserInfoEntity::getToken, "empty").set(PlayClerkUserInfoEntity::getOnlineState, "0");
|
||||||
.eq(PlayClerkUserInfoEntity::getId, clerkId)
|
|
||||||
.set(PlayClerkUserInfoEntity::getToken, "empty")
|
|
||||||
.set(PlayClerkUserInfoEntity::getOnlineState, "0");
|
|
||||||
this.baseMapper.update(null, wrapper);
|
this.baseMapper.update(null, wrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -286,21 +273,17 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateAccountBalanceById(String userId, BigDecimal balanceBeforeOperation,
|
public void updateAccountBalanceById(String userId, BigDecimal balanceBeforeOperation, BigDecimal balanceAfterOperation, String operationType, String operationAction, BigDecimal balanceMoney, String orderId) {
|
||||||
BigDecimal balanceAfterOperation, String operationType, String operationAction, BigDecimal balanceMoney,
|
|
||||||
String orderId) {
|
|
||||||
// 修改用户余额
|
// 修改用户余额
|
||||||
this.baseMapper.updateById(new PlayClerkUserInfoEntity(userId, balanceAfterOperation));
|
this.baseMapper.updateById(new PlayClerkUserInfoEntity(userId, balanceAfterOperation));
|
||||||
// 记录余额变更记录
|
// 记录余额变更记录
|
||||||
playBalanceDetailsInfoService.insertBalanceDetailsInfo("0", userId, balanceBeforeOperation,
|
playBalanceDetailsInfoService.insertBalanceDetailsInfo("0", userId, balanceBeforeOperation, balanceAfterOperation, operationType, operationAction, balanceMoney, BigDecimal.ZERO, orderId);
|
||||||
balanceAfterOperation, operationType, operationAction, balanceMoney, BigDecimal.ZERO, orderId);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询店员列表
|
* 查询店员列表
|
||||||
*
|
*
|
||||||
* @param vo
|
* @param vo 店员查询对象
|
||||||
* 店员查询对象
|
|
||||||
* @return 店员
|
* @return 店员
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@@ -311,12 +294,10 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
// 查询不隐藏的
|
// 查询不隐藏的
|
||||||
lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getDisplayState, "1");
|
lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getDisplayState, "1");
|
||||||
// 查询主表全部字段
|
// 查询主表全部字段
|
||||||
lambdaQueryWrapper.selectAll(PlayClerkUserInfoEntity.class).selectAs(PlayClerkUserInfoEntity::getCity,
|
lambdaQueryWrapper.selectAll(PlayClerkUserInfoEntity.class).selectAs(PlayClerkUserInfoEntity::getCity, "address");
|
||||||
"address");
|
|
||||||
// 等级表
|
// 等级表
|
||||||
lambdaQueryWrapper.selectAs(PlayClerkLevelInfoEntity::getName, "levelName");
|
lambdaQueryWrapper.selectAs(PlayClerkLevelInfoEntity::getName, "levelName");
|
||||||
lambdaQueryWrapper.leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId,
|
lambdaQueryWrapper.leftJoin(PlayClerkLevelInfoEntity.class, PlayClerkLevelInfoEntity::getId, PlayClerkUserInfoEntity::getLevelId);
|
||||||
PlayClerkUserInfoEntity::getLevelId);
|
|
||||||
|
|
||||||
// 服务项目表
|
// 服务项目表
|
||||||
if (StrUtil.isNotBlank(vo.getNickname())) {
|
if (StrUtil.isNotBlank(vo.getNickname())) {
|
||||||
@@ -345,9 +326,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 排序:非空的等级排序号优先,值越小越靠前;同一排序号在线状态优先
|
// 排序:非空的等级排序号优先,值越小越靠前;同一排序号在线状态优先
|
||||||
lambdaQueryWrapper.orderByAsc(true, "CASE WHEN t1.order_number IS NULL THEN 1 ELSE 0 END")
|
lambdaQueryWrapper.orderByDesc(PlayClerkUserInfoEntity::getOnlineState)
|
||||||
.orderByAsc(PlayClerkLevelInfoEntity::getOrderNumber)
|
.orderByAsc(PlayClerkLevelInfoEntity::getOrderNumber)
|
||||||
.orderByDesc(PlayClerkUserInfoEntity::getOnlineState);
|
.orderByAsc(PlayClerkUserInfoEntity::getCreatedTime);
|
||||||
|
|
||||||
return this.baseMapper.selectJoinPage(page, PlayClerkUserInfoResultVo.class, lambdaQueryWrapper);
|
return this.baseMapper.selectJoinPage(page, PlayClerkUserInfoResultVo.class, lambdaQueryWrapper);
|
||||||
}
|
}
|
||||||
@@ -364,8 +345,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
public IPage<PlayClerkUnsettledWagesInfoReturnVo> listUnsettledWagesByPage(PlayClerkUnsettledWagesInfoQueryVo vo) {
|
public IPage<PlayClerkUnsettledWagesInfoReturnVo> listUnsettledWagesByPage(PlayClerkUnsettledWagesInfoQueryVo vo) {
|
||||||
MPJLambdaWrapper<PlayClerkUserInfoEntity> lambdaQueryWrapper = new MPJLambdaWrapper<>();
|
MPJLambdaWrapper<PlayClerkUserInfoEntity> lambdaQueryWrapper = new MPJLambdaWrapper<>();
|
||||||
// 查询所有店员
|
// 查询所有店员
|
||||||
lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname")
|
lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getId, "clerkId");
|
||||||
.selectAs(PlayClerkUserInfoEntity::getId, "clerkId");
|
|
||||||
lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getClerkState, ClerkRoleStatus.CLERK.getCode());
|
lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getClerkState, ClerkRoleStatus.CLERK.getCode());
|
||||||
// 加入组员的筛选
|
// 加入组员的筛选
|
||||||
List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null);
|
List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), null);
|
||||||
@@ -377,14 +357,11 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getListingState, vo.getListingState());
|
lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getListingState, vo.getListingState());
|
||||||
}
|
}
|
||||||
// 查询店员订单信息
|
// 查询店员订单信息
|
||||||
lambdaQueryWrapper.selectCollection(PlayOrderInfoEntity.class,
|
lambdaQueryWrapper.selectCollection(PlayOrderInfoEntity.class, PlayClerkUnsettledWagesInfoReturnVo::getOrderInfoEntities);
|
||||||
PlayClerkUnsettledWagesInfoReturnVo::getOrderInfoEntities);
|
lambdaQueryWrapper.leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getAcceptBy, PlayClerkUserInfoEntity::getId);
|
||||||
lambdaQueryWrapper.leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getAcceptBy,
|
|
||||||
PlayClerkUserInfoEntity::getId);
|
|
||||||
lambdaQueryWrapper.eq(PlayOrderInfoEntity::getOrderSettlementState, "0");
|
lambdaQueryWrapper.eq(PlayOrderInfoEntity::getOrderSettlementState, "0");
|
||||||
|
|
||||||
return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()),
|
return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkUnsettledWagesInfoReturnVo.class, lambdaQueryWrapper);
|
||||||
PlayClerkUnsettledWagesInfoReturnVo.class, lambdaQueryWrapper);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -483,12 +460,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList);
|
lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList);
|
||||||
|
|
||||||
// 排序:置顶状态优先,在线用户其次,最后按创建时间倒序
|
// 排序:置顶状态优先,在线用户其次,最后按创建时间倒序
|
||||||
lambdaQueryWrapper.orderByDesc(PlayClerkUserInfoEntity::getPinToTopState)
|
lambdaQueryWrapper.orderByDesc(PlayClerkUserInfoEntity::getPinToTopState).orderByDesc(PlayClerkUserInfoEntity::getOnlineState).orderByDesc(PlayClerkUserInfoEntity::getCreatedTime);
|
||||||
.orderByDesc(PlayClerkUserInfoEntity::getOnlineState)
|
|
||||||
.orderByDesc(PlayClerkUserInfoEntity::getCreatedTime);
|
|
||||||
|
|
||||||
IPage<PlayClerkUserReturnVo> page = this.baseMapper.selectJoinPage(
|
IPage<PlayClerkUserReturnVo> page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkUserReturnVo.class, lambdaQueryWrapper);
|
||||||
new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkUserReturnVo.class, lambdaQueryWrapper);
|
|
||||||
|
|
||||||
for (PlayClerkUserReturnVo record : page.getRecords()) {
|
for (PlayClerkUserReturnVo record : page.getRecords()) {
|
||||||
BigDecimal orderTotalAmount = new BigDecimal("0");
|
BigDecimal orderTotalAmount = new BigDecimal("0");
|
||||||
@@ -519,10 +493,8 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
if (StrUtil.isNotBlank(customUserId)) {
|
if (StrUtil.isNotBlank(customUserId)) {
|
||||||
LambdaQueryWrapper<PlayCustomFollowInfoEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<PlayCustomFollowInfoEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
lambdaQueryWrapper.eq(PlayCustomFollowInfoEntity::getCustomId, customUserId);
|
lambdaQueryWrapper.eq(PlayCustomFollowInfoEntity::getCustomId, customUserId);
|
||||||
List<PlayCustomFollowInfoEntity> customFollowInfoEntities = customFollowInfoService
|
List<PlayCustomFollowInfoEntity> customFollowInfoEntities = customFollowInfoService.list(lambdaQueryWrapper);
|
||||||
.list(lambdaQueryWrapper);
|
customFollows = customFollowInfoEntities.stream().collect(Collectors.toMap(PlayCustomFollowInfoEntity::getClerkId, PlayCustomFollowInfoEntity::getFollowState));
|
||||||
customFollows = customFollowInfoEntities.stream().collect(Collectors
|
|
||||||
.toMap(PlayCustomFollowInfoEntity::getClerkId, PlayCustomFollowInfoEntity::getFollowState));
|
|
||||||
}
|
}
|
||||||
for (PlayClerkUserInfoResultVo record : voPage.getRecords()) {
|
for (PlayClerkUserInfoResultVo record : voPage.getRecords()) {
|
||||||
record.setFollowState(customFollows.containsKey(record.getId()) ? "1" : "0");
|
record.setFollowState(customFollows.containsKey(record.getId()) ? "1" : "0");
|
||||||
@@ -537,8 +509,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
/**
|
/**
|
||||||
* 新增店员
|
* 新增店员
|
||||||
*
|
*
|
||||||
* @param playClerkUserInfo
|
* @param playClerkUserInfo 店员
|
||||||
* 店员
|
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@@ -552,16 +523,12 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
/**
|
/**
|
||||||
* 修改店员
|
* 修改店员
|
||||||
*
|
*
|
||||||
* @param playClerkUserInfo
|
* @param playClerkUserInfo 店员
|
||||||
* 店员
|
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean update(PlayClerkUserInfoEntity playClerkUserInfo) {
|
public boolean update(PlayClerkUserInfoEntity playClerkUserInfo) {
|
||||||
boolean inspectStatus = StringUtils.isNotBlank(playClerkUserInfo.getId())
|
boolean inspectStatus = StringUtils.isNotBlank(playClerkUserInfo.getId()) && (StrUtil.isNotBlank(playClerkUserInfo.getOnboardingState()) || StrUtil.isNotBlank(playClerkUserInfo.getListingState()) || StrUtil.isNotBlank(playClerkUserInfo.getClerkState()));
|
||||||
&& (StrUtil.isNotBlank(playClerkUserInfo.getOnboardingState())
|
|
||||||
|| StrUtil.isNotBlank(playClerkUserInfo.getListingState())
|
|
||||||
|| StrUtil.isNotBlank(playClerkUserInfo.getClerkState()));
|
|
||||||
PlayClerkUserInfoEntity beforeUpdate = null;
|
PlayClerkUserInfoEntity beforeUpdate = null;
|
||||||
if (inspectStatus) {
|
if (inspectStatus) {
|
||||||
beforeUpdate = this.baseMapper.selectById(playClerkUserInfo.getId());
|
beforeUpdate = this.baseMapper.selectById(playClerkUserInfo.getId());
|
||||||
@@ -576,8 +543,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
/**
|
/**
|
||||||
* 批量删除店员
|
* 批量删除店员
|
||||||
*
|
*
|
||||||
* @param ids
|
* @param ids 需要删除的店员主键
|
||||||
* 需要删除的店员主键
|
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@@ -588,8 +554,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
/**
|
/**
|
||||||
* 删除店员信息
|
* 删除店员信息
|
||||||
*
|
*
|
||||||
* @param id
|
* @param id 店员主键
|
||||||
* 店员主键
|
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@@ -603,9 +568,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
LambdaQueryWrapper<PlayClerkUserInfoEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<PlayClerkUserInfoEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getDeleted, 0);
|
lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getDeleted, 0);
|
||||||
lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList);
|
lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList);
|
||||||
lambdaQueryWrapper.select(PlayClerkUserInfoEntity::getId, PlayClerkUserInfoEntity::getNickname,
|
lambdaQueryWrapper.select(PlayClerkUserInfoEntity::getId, PlayClerkUserInfoEntity::getNickname, PlayClerkUserInfoEntity::getAvatar, PlayClerkUserInfoEntity::getTypeId, PlayClerkUserInfoEntity::getGroupId, PlayClerkUserInfoEntity::getPhone);
|
||||||
PlayClerkUserInfoEntity::getAvatar, PlayClerkUserInfoEntity::getTypeId,
|
|
||||||
PlayClerkUserInfoEntity::getGroupId, PlayClerkUserInfoEntity::getPhone);
|
|
||||||
lambdaQueryWrapper.orderByDesc(PlayClerkUserInfoEntity::getId);
|
lambdaQueryWrapper.orderByDesc(PlayClerkUserInfoEntity::getId);
|
||||||
return this.baseMapper.selectList(lambdaQueryWrapper);
|
return this.baseMapper.selectList(lambdaQueryWrapper);
|
||||||
}
|
}
|
||||||
@@ -621,8 +584,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
LoginUser loginUserInfo = loginService.getLoginUserInfo(entity.getSysUserId());
|
LoginUser loginUserInfo = loginService.getLoginUserInfo(entity.getSysUserId());
|
||||||
Map<String, Object> tokenMap = jwtToken.createToken(loginUserInfo);
|
Map<String, Object> tokenMap = jwtToken.createToken(loginUserInfo);
|
||||||
data.fluentPut("token", tokenMap.get("token"));
|
data.fluentPut("token", tokenMap.get("token"));
|
||||||
PlayPersonnelAdminInfoEntity adminInfoEntity = playPersonnelAdminInfoService
|
PlayPersonnelAdminInfoEntity adminInfoEntity = playPersonnelAdminInfoService.selectByUserId(entity.getSysUserId());
|
||||||
.selectByUserId(entity.getSysUserId());
|
|
||||||
if (Objects.nonNull(adminInfoEntity)) {
|
if (Objects.nonNull(adminInfoEntity)) {
|
||||||
data.fluentPut("role", "operator");
|
data.fluentPut("role", "operator");
|
||||||
return data;
|
return data;
|
||||||
@@ -632,8 +594,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
data.fluentPut("role", "leader");
|
data.fluentPut("role", "leader");
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
PlayPersonnelWaiterInfoEntity waiterInfoEntity = playClerkWaiterInfoService
|
PlayPersonnelWaiterInfoEntity waiterInfoEntity = playClerkWaiterInfoService.selectByUserId(entity.getSysUserId());
|
||||||
.selectByUserId(entity.getSysUserId());
|
|
||||||
if (Objects.nonNull(waiterInfoEntity)) {
|
if (Objects.nonNull(waiterInfoEntity)) {
|
||||||
data.fluentPut("role", "waiter");
|
data.fluentPut("role", "waiter");
|
||||||
return data;
|
return data;
|
||||||
@@ -645,12 +606,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
|
|||||||
if (beforeUpdate == null) {
|
if (beforeUpdate == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (OnboardingStatus.transitionedToOffboarded(updatedPayload.getOnboardingState(),
|
if (OnboardingStatus.transitionedToOffboarded(updatedPayload.getOnboardingState(), beforeUpdate.getOnboardingState()) || ListingStatus.transitionedToDelisted(updatedPayload.getListingState(), beforeUpdate.getListingState()) || ClerkRoleStatus.transitionedToNonClerk(updatedPayload.getClerkState(), beforeUpdate.getClerkState())) {
|
||||||
beforeUpdate.getOnboardingState())
|
|
||||||
|| ListingStatus.transitionedToDelisted(updatedPayload.getListingState(),
|
|
||||||
beforeUpdate.getListingState())
|
|
||||||
|| ClerkRoleStatus.transitionedToNonClerk(updatedPayload.getClerkState(),
|
|
||||||
beforeUpdate.getClerkState())) {
|
|
||||||
invalidateClerkSession(beforeUpdate.getId());
|
invalidateClerkSession(beforeUpdate.getId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user