代理后台功能

game-service/src/main/java/awesome/group/game/service/bo/MatrixAdvRecordBo.java

@@ -4,7 +4,6 @@ import awesome.group.game.dao.bean.MatrixAdvRecord;
 import awesome.group.game.dao.bean.MatrixApp;
 import awesome.group.game.dao.bean.MatrixUser;
 import awesome.group.game.service.bo.citrus.UserBo;
-import org.springframework.util.StringUtils;
 
 public class MatrixAdvRecordBo extends MatrixAdvRecordEditBo {
     public String appName;
@@ -12,6 +11,8 @@ public class MatrixAdvRecordBo extends MatrixAdvRecordEditBo {
     public long createdAt;
     public Integer id;
 
+    public Long ecpmReal;//金币数
+
     public UserBo user;
 
     public String adminName;
@@ -29,6 +30,7 @@ public class MatrixAdvRecordBo extends MatrixAdvRecordEditBo {
         this.appCode = app.getCode();
         this.createdAt = r.getCreatedAt().getTime();
         this.id = r.getId();
+        this.ecpmReal = r.getEcpmReal();
     }
 
     public void setUser(MatrixUser u) {

game-service/src/main/java/awesome/group/game/service/matrix/AdminDeviceService.java

@@ -25,6 +25,8 @@ import java.time.YearMonth;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static awesome.group.game.service.util.Constants.DEVICE_OWNER;
+
 @Service
 public class AdminDeviceService {
 
@@ -91,7 +93,7 @@ public class AdminDeviceService {
             return "设备已绑定";
         }
         MatrixAdmin admin = adminMapper.query(adminName);
-        if (admin == null || admin.getRole() != AdminService.DEVICE_OWNER) {
+        if (admin == null || admin.getRole() != DEVICE_OWNER) {
             return "设备主不存在";
         }
         MatrixApp app = appMapper.queryByCode(appCode);

game-service/src/main/java/awesome/group/game/service/matrix/AdminService.java

@@ -39,6 +39,8 @@ import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
 
+import static awesome.group.game.service.util.Constants.*;
+
 @Service
 public class AdminService {
 
@@ -74,12 +76,6 @@ public class AdminService {
     @Autowired
     private MatrixUserMapper userMapper;
 
-    public static final int SUPER_ADMIN = 1;//超级管理员
-    public static final int NORMAL_ADMIN = 2;//普通管理员
-    public static final int OTHER = 3;//普通账号，游戏主
-    public static final int DEVICE_OWNER = 4; //设备主
-    public static final int PROXY = 5; //代理
-
     public MatrixAdmin login(String name, String pwd, String channel) {
         MatrixAdmin admin = adminMapper.query(name);
         if (admin == null) {
@@ -108,7 +104,7 @@ public class AdminService {
             return null;
         }
         MatrixAdmin admin = adminMapper.selectById(adminId);
-        if (admin.getRole() == DEVICE_OWNER) {
+        if (admin.getRole() == DEVICE_OWNER || admin.getRole() == PROXY) {
             wrapper.eq("admin_id", adminId);
         } else if (param.adminId != null) {
             wrapper.eq("admin_id", param.adminId);

game-service/src/main/java/awesome/group/game/service/matrix/MatrixUserService.java

@@ -1,5 +1,6 @@
 package awesome.group.game.service.matrix;
 
+import awesome.group.game.dao.bean.MatrixAdmin;
 import awesome.group.game.dao.bean.MatrixApp;
 import awesome.group.game.dao.bean.MatrixUser;
 import awesome.group.game.dao.mapper.MatrixAppMapper;
@@ -7,6 +8,7 @@ import awesome.group.game.dao.mapper.MatrixUserMapper;
 import awesome.group.game.service.bo.PageResult;
 import awesome.group.game.service.bo.citrus.UserBo;
 import awesome.group.game.service.bo.matrix.UserQuery;
+import awesome.group.game.service.util.Constants;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -31,13 +33,18 @@ public class MatrixUserService {
     @Autowired
     private AdminService adminService;
 
-    public PageResult<UserBo> list(UserQuery query) {
+    public PageResult<UserBo> list(Integer adminId, UserQuery query) {
+        MatrixAdmin admin = adminService.getAdmin(adminId);
+
         MatrixApp app = appMapper.queryByCode(query.appCode);
         LambdaQueryWrapper<MatrixUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(MatrixUser::getAppId, app.getId());
         if (query.userId != null) {
             wrapper.eq(MatrixUser::getId, query.userId);
         }
+        if (admin.getRole() == Constants.PROXY) {
+            wrapper.eq(MatrixUser::getAdminId, adminId);
+        }
         int page = query.current;
         int pageSize = query.pageSize;
         wrapper.orderByDesc(MatrixUser::getId);

game-service/src/main/java/awesome/group/game/service/util/Constants.java

@@ -6,4 +6,10 @@ public class Constants {
     public static final int POP_UP = 2;
     public static final int VIDEO = 3;
 
+    public static final int SUPER_ADMIN = 1;//超级管理员
+    public static final int NORMAL_ADMIN = 2;//普通管理员
+    public static final int OTHER = 3;//普通账号，游戏主
+    public static final int DEVICE_OWNER = 4; //设备主
+    public static final int PROXY = 5; //代理
+
 }

game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixUserController.java

@@ -20,7 +20,7 @@ public class MatrixUserController {
     @PostMapping("/list")
     @RestApi
     public R<PageResult<UserBo>> list(@RequestBody UserQuery query) {
-        return new R<>(userService.list(query));
+        return new R<>(userService.list(RequestContext.getAdminID(), query));
     }
 
     @PostMapping("/changeStatus")