Переглянути джерело

修改查询逻辑、去掉代码注释

dos 2 місяців тому
батько
коміт
4a9f8c2546

+ 2 - 2
game-business/src/main/java/com/game/business/websocket/WebSocketConnent.java

@@ -29,7 +29,7 @@ public class WebSocketConnent {
     }
 
     public void connect() throws Exception{
-        /*while (true){
+        while (true){
             try {
                 System.out.println("正在" + (this.WS_CONNENT_NUM == 0 ? "" : ("第" + this.WS_CONNENT_NUM + "次")) + "连接WebSocket[" + this.WS_URL_NAME + "]......");
 
@@ -63,6 +63,6 @@ public class WebSocketConnent {
                 System.out.println("连接[" + this.WS_URL_NAME + "]异常," + this.WS_CONNENT_NUM + "秒后尝试重新连接:" + e.getMessage());
                 Thread.sleep(this.WS_CONNENT_NUM * 1000);
             }
-        }*/
+        }
     }
 }

+ 1 - 1
game-business/src/main/resources/mapper/business/AppUserAgentMapper.xml

@@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (select IFNULL(sum(e.game_win_amount - e.game_lose_amount),0) from app_user_count as e where e.user_id = a.user_id) as gameAmount,
             a.live_rate as liveRate,
             a.dividend_guarantee_rate as dividendGuaranteeRate
-        from app_user_agent as a left join mugozbg_live.app_user as c on a.user_id = c.userid where a.pid = #{teamDto.pid}
+        from app_user_agent as a left join mugozbg_live.app_user as c on a.user_id = c.userid where (a.pid = #{teamDto.pid} or a.user_id = #{teamDto.pid})
         <if test="teamDto.userId != null ">
              and a.user_id = #{teamDto.userId}
         </if>