用户列表 新增参数

src/main/java/com/sqx/modules/app/dto/UserInviteDTO.java

@@ -0,0 +1,14 @@
+package com.sqx.modules.app.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author GYJoker
+ */
+@Data
+public class UserInviteDTO {
+    private String userId;
+    private BigDecimal inviteAmount;
+}

src/main/java/com/sqx/modules/app/entity/UserEntity.java

@@ -188,6 +188,11 @@ public class UserEntity implements Serializable {
      */
     private BigDecimal inviteAmount;
 
+    /**
+     * 累计邀请人数
+     */
+    private Integer inviteCount;
+
     /**
      * 是否是新用户 1否
      */
@@ -212,6 +217,9 @@ public class UserEntity implements Serializable {
     @TableField(exist = false)
     private Integer vipType;
 
+    @TableField(exist = false)
+    private Integer cashCount;
 
-
+    @TableField(exist = false)
+    private BigDecimal cashAmount;
 }

src/main/java/com/sqx/modules/app/entity/UserMoney.java

@@ -60,4 +60,13 @@ public class UserMoney implements Serializable {
     private BigDecimal inviteIncomeMoney;;
     private BigDecimal inviteIncomeCoin;
 
+    /**
+     * 累计提现金额
+     */
+    private BigDecimal cashAmount;
+    /**
+     * 累计提现次数
+     */
+    private Integer cashCount;
+
 }

src/main/java/com/sqx/modules/app/service/UserService.java

@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
-import com.sqx.modules.app.dto.AuthCertNoDTO;
-import com.sqx.modules.app.dto.AuthDTO;
-import com.sqx.modules.app.dto.LoginDTO;
-import com.sqx.modules.app.dto.RegisterDTO;
+import com.sqx.modules.app.dto.*;
 import com.sqx.modules.app.entity.UserEntity;
 
 import javax.servlet.http.HttpServletRequest;
@@ -234,4 +231,8 @@ public interface UserService extends IService<UserEntity> {
     UserEntity queryByInvitationCodeOrUserId(Long inviterUserId, String invitationCode);
 
     Result register(RegisterDTO registerDTO);
+
+    Result updateUserInviteAmount(UserInviteDTO userInviteDTO);
+
+    Result removeUserBlack(Long userId);
 }

src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -1758,4 +1758,41 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 
         return baseMapper.selectOne(new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, inviterUserId));
     }
+
+    @Override
+    public Result updateUserInviteAmount(UserInviteDTO userInviteDTO) {
+        if (StrUtil.isBlank(userInviteDTO.getUserId())) {
+            return Result.error("用户id不能为空");
+        }
+
+        if (userInviteDTO.getInviteAmount() == null || userInviteDTO.getInviteAmount().compareTo(BigDecimal.ZERO) <= 0) {
+            return Result.error("邀请奖励金额必须大于0");
+        }
+
+        UserEntity userEntity = baseMapper.selectById(userInviteDTO.getUserId());
+        if (userEntity == null) {
+            return Result.error("用户不存在");
+        }
+        userEntity.setInviteAmount(userInviteDTO.getInviteAmount());
+
+        baseMapper.update(userEntity, new LambdaUpdateWrapper<UserEntity>().eq(UserEntity::getUserId, userInviteDTO.getUserId()));
+
+        return Result.success("更新成功");
+    }
+
+    @Override
+    public Result removeUserBlack(Long userId) {
+        UserEntity userEntity = getById(userId);
+        if (userEntity == null) {
+            return Result.error("用户不存在");
+        }
+        userEntity.setStatus(1);
+        update(userEntity, new LambdaUpdateWrapper<UserEntity>().eq(UserEntity::getUserId, userId));
+
+        UserInfo userInfo = userInfoService.getOne(new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getUserId, userId));
+        if (userInfo != null && StrUtil.isNotBlank(userInfo.getCertNo())) {
+            tbUserBlacklistMapper.delete(new LambdaQueryWrapper<TbUserBlacklist>().eq(TbUserBlacklist::getIdCardNo, userInfo.getCertNo()));
+        }
+        return Result.success("解除拉黑成功");
+    }
 }