设备环境展示 & 支持userId查广告详情

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

@@ -9,4 +9,5 @@ public class AdvRecordQuery extends PageParam {
     public String code;
     public List<String> createdAt;
     public Integer adminId;
+    public Integer userId;
 }

game-service/src/main/java/awesome/group/game/service/bo/citrus/UserBo.java

@@ -17,6 +17,8 @@ public class UserBo {
     public String inviteCode;
     public String inviteUrl;
 
+    public Integer env;
+
     public String wxOpenId;//微信openId
     public long createdAt;
 
@@ -37,9 +39,10 @@ public class UserBo {
         this.realMoney = u.getRealMoney();
         this.goldCoin = u.getIncome() - (u.getMoney() * 1000);
         this.wxOpenId = u.getWxOpenId();
+        this.env = u.getEnv();
         this.createdAt = u.getCreatedAt().getTime();
 
-        if(!StringUtils.hasText(nickname)) {
+        if (!StringUtils.hasText(nickname)) {
             this.nickname = replaceWithX(this.mobile);
         }
 

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

@@ -119,6 +119,9 @@ public class AdminService {
         if (StringUtils.hasText(param.deviceId)) {
             wrapper.eq("device_id", param.deviceId);
         }
+        if(param.userId != null) {
+            wrapper.eq("user_id", param.userId);
+        }
         if (!CollectionUtils.isEmpty(param.createdAt)) {
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
             try {