From 62608919cde0e14a7f0ed1091e0c30f05be1230f Mon Sep 17 00:00:00 2001
From: nili <nili@baicizhan.com>
Date: Mon, 8 Apr 2024 16:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E5=BF=BD=E7=95=A5ch?=
 =?UTF-8?q?annel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/awesome/group/game/dao/bean/MatrixApp.java  | 1 -
 .../group/game/dao/mapper/MatrixAdvRecordMapper.java      | 8 ++++----
 .../java/awesome/group/game/service/MatrixService.java    | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/game-dao/src/main/java/awesome/group/game/dao/bean/MatrixApp.java b/game-dao/src/main/java/awesome/group/game/dao/bean/MatrixApp.java
index 8196df1..9e5b5b5 100644
--- a/game-dao/src/main/java/awesome/group/game/dao/bean/MatrixApp.java
+++ b/game-dao/src/main/java/awesome/group/game/dao/bean/MatrixApp.java
@@ -12,6 +12,5 @@ public class MatrixApp {
     private String code;
     private String url;
     private Long income;//分
-    private String channel;
     private String secret;
 }
diff --git a/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixAdvRecordMapper.java b/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixAdvRecordMapper.java
index 1a66b27..a4ce44a 100644
--- a/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixAdvRecordMapper.java
+++ b/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixAdvRecordMapper.java
@@ -11,9 +11,9 @@ public interface MatrixAdvRecordMapper extends BaseMapper<MatrixAdvRecord> {
     @Select("select * from matrix_app where code = #{code}")
     MatrixApp queryApp(String code);
 
-    @Select("select count(*) from matrix_white_device where channel = #{channel} and device_id = #{deviceId}")
-    Integer queryWhitelist(String channel, String deviceId);
+    @Select("select count(*) from matrix_white_device where device_id = #{deviceId}")
+    Integer queryWhitelist(String deviceId);
 
-    @Insert("insert ignore into matrix_white_device (channel, device_id) values (#{channel}, #{deviceId})")
-    void insertWhiteList(String channel, String deviceId);
+    @Insert("insert ignore into matrix_white_device (device_id) values (#{deviceId})")
+    void insertWhiteList(String deviceId);
 }
diff --git a/game-service/src/main/java/awesome/group/game/service/MatrixService.java b/game-service/src/main/java/awesome/group/game/service/MatrixService.java
index 58ae203..3d5021c 100644
--- a/game-service/src/main/java/awesome/group/game/service/MatrixService.java
+++ b/game-service/src/main/java/awesome/group/game/service/MatrixService.java
@@ -69,7 +69,7 @@ public class MatrixService {
         if (app == null) {
             return false;
         }
-        return mapper.queryWhitelist(app.getChannel(), deviceId) > 0;
+        return mapper.queryWhitelist(deviceId) > 0;
     }
 
     public void addIntoWhiteList(String deviceId, String appCode) {
@@ -77,9 +77,9 @@ public class MatrixService {
         if (app == null) {
             return;
         }
-        if (mapper.queryWhitelist(app.getChannel(), deviceId) > 0) {
+        if (mapper.queryWhitelist(deviceId) > 0) {
             return;
         }
-        mapper.insertWhiteList(app.getChannel(), deviceId);
+        mapper.insertWhiteList(deviceId);
     }
 }