查询携带余额
This commit is contained in:
@@ -446,8 +446,8 @@ public class UserController {
|
|||||||
@ApiOperation("更新用户邀请奖励金额")
|
@ApiOperation("更新用户邀请奖励金额")
|
||||||
@RequestMapping(value = "/removeUserBlack", method = RequestMethod.GET)
|
@RequestMapping(value = "/removeUserBlack", method = RequestMethod.GET)
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public Result removeUserBlack(Long userId) {
|
public Result removeUserBlack(Long userId, Integer status) {
|
||||||
return userService.removeUserBlack(userId);
|
return userService.removeUserBlack(userId, status);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -222,4 +222,7 @@ public class UserEntity implements Serializable {
|
|||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private BigDecimal cashAmount;
|
private BigDecimal cashAmount;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private BigDecimal balance;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -235,7 +235,7 @@ public interface UserService extends IService<UserEntity> {
|
|||||||
|
|
||||||
Result updateUserInviteAmount(UserInviteDTO userInviteDTO);
|
Result updateUserInviteAmount(UserInviteDTO userInviteDTO);
|
||||||
|
|
||||||
Result removeUserBlack(Long userId);
|
Result removeUserBlack(Long userId, Integer status);
|
||||||
|
|
||||||
Map<String, Object> queryPayAndExtractInfo();
|
Map<String, Object> queryPayAndExtractInfo();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1777,11 +1777,18 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Result removeUserBlack(Long userId) {
|
public Result removeUserBlack(Long userId, Integer status) {
|
||||||
UserEntity userEntity = getById(userId);
|
UserEntity userEntity = getById(userId);
|
||||||
if (userEntity == null) {
|
if (userEntity == null) {
|
||||||
return Result.error("用户不存在");
|
return Result.error("用户不存在");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (status == 0) {
|
||||||
|
userEntity.setStatus(0);
|
||||||
|
update(userEntity, new LambdaUpdateWrapper<UserEntity>().eq(UserEntity::getUserId, userId));
|
||||||
|
return Result.success("拉黑成功");
|
||||||
|
}
|
||||||
|
|
||||||
userEntity.setStatus(1);
|
userEntity.setStatus(1);
|
||||||
update(userEntity, new LambdaUpdateWrapper<UserEntity>().eq(UserEntity::getUserId, userId));
|
update(userEntity, new LambdaUpdateWrapper<UserEntity>().eq(UserEntity::getUserId, userId));
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,8 @@
|
|||||||
select u.*,1 as member,
|
select u.*,1 as member,
|
||||||
s.username as sysUserName,
|
s.username as sysUserName,
|
||||||
m.cash_count as cashCount,
|
m.cash_count as cashCount,
|
||||||
m.cash_amount as cashAmount
|
m.cash_amount as cashAmount,
|
||||||
|
m.amount as balance
|
||||||
from tb_user u
|
from tb_user u
|
||||||
left join sys_user s on s.qd_code=u.qd_code
|
left join sys_user s on s.qd_code=u.qd_code
|
||||||
left join user_money m on m.user_id=u.user_id
|
left join user_money m on m.user_id=u.user_id
|
||||||
|
|||||||
Reference in New Issue
Block a user