* init

src/main/java/com/tdba/cxb/ares/api/controller/UserController.java

@@ -130,21 +130,10 @@ public class UserController {
                 Map.of("value", 4, "label", "代理商")));
     }
 
-    public static void main(String[] args) throws InterruptedException {
-
-        Exchanger exchanger = new Exchanger();
-
-        for (int i = 1; i <= 10; i++) {
-            Integer data = i;
-            new Thread(() -> {
-                try {
-                    Object exchange = exchanger.exchange(data);
-                    System.out.println(Thread.currentThread().getName() + "-" + exchange);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }, "Java技术栈" + i).start();
-        }
-
+    @GetMapping("logout")
+    public TDBAResponse logout(BaseUser baseUser){
+        Objects.requireNonNull(baseUser, "请登录后操作");
+        return buildSuccess("退出成功");
     }
+
 }

src/main/java/com/tdba/cxb/ares/api/service/UserService.java

@@ -341,6 +341,12 @@ public class UserService {
 
     @Resource
     private StringRedisTemplate stringRedisTemplate;
+
+
+    public void logout(BaseUser baseUser){
+
+    }
+
     /**
      * 登录
      * @param param

src/main/resources/mapper/UserMapper.xml

@@ -9,8 +9,8 @@
         from
             rrx_user
         where
-            <![CDATA[  spread_uid > 0 ]]>
-            <![CDATA[ and create_time >= #{beginTime} ]]>
+--             <![CDATA[  spread_uid > 0 ]]>
+            <![CDATA[ create_time >= #{beginTime} ]]>
             <![CDATA[ and create_time <= #{endTime} ]]>
     </select>
 

src/main/resources/mapper/UserRelateMapper.xml

@@ -177,36 +177,24 @@
             <when test="userType == 1">
                 and ur.is_dacang = 1
             </when>
-            <otherwise>
-                and ur.is_dacang = 0
-            </otherwise>
         </choose>
 
         <choose>
             <when test="userType == 2">
                 and ur.is_merchant = 1
             </when>
-            <otherwise>
-                and ur.is_merchant = 0
-            </otherwise>
         </choose>
 
         <choose>
             <when test="userType == 3">
                 and ur.is_channel = 1
             </when>
-            <otherwise>
-                and ur.is_channel = 0
-            </otherwise>
         </choose>
 
         <choose>
             <when test="userType == 4">
                 and ur.is_agent = 1
             </when>
-            <otherwise>
-                and ur.is_agent = 0
-            </otherwise>
         </choose>
         order by date desc
     </select>