|
@@ -417,18 +417,18 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-// // 查询两个人是否是陌生人(只有一条消息)
|
|
|
|
|
-// QueryWrapper<LifeMessage> wrapper = new QueryWrapper<>();
|
|
|
|
|
-// // 没聊过
|
|
|
|
|
-// wrapper.apply("((sender_id = '" + senderId + "' and receiver_id = '" + receiverId + "') or (sender_id = '" + receiverId + "' and receiver_id = '" + senderId + "'))");
|
|
|
|
|
-// wrapper.orderByDesc("created_time");
|
|
|
|
|
-// int count = lifeMessageMapper.selectCount(wrapper);
|
|
|
|
|
|
|
+ // 查询两个人是否是陌生人(只有一条消息)
|
|
|
|
|
+ QueryWrapper<LifeMessage> wrapper = new QueryWrapper<>();
|
|
|
|
|
+ // 没聊过
|
|
|
|
|
+ wrapper.apply("((sender_id = '" + senderId + "' and receiver_id = '" + receiverId + "') or (sender_id = '" + receiverId + "' and receiver_id = '" + senderId + "'))");
|
|
|
|
|
+ wrapper.orderByDesc("created_time");
|
|
|
|
|
+ int count = lifeMessageMapper.selectCount(wrapper);
|
|
|
|
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
jsonObject.put("messageList", lifeMessageVos);
|
|
jsonObject.put("messageList", lifeMessageVos);
|
|
|
-// jsonObject.put("isStranger", count <= 1);
|
|
|
|
|
|
|
+ jsonObject.put("isStranger", count <= 1);
|
|
|
// 陌生人不限制一条消息
|
|
// 陌生人不限制一条消息
|
|
|
- jsonObject.put("isStranger", false);
|
|
|
|
|
|
|
+// jsonObject.put("isStranger", false);
|
|
|
|
|
|
|
|
return jsonObject;
|
|
return jsonObject;
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -449,37 +449,37 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
|
|
|
// return lifeMessageMapper.selectCount(wrapper) <= 1;
|
|
// return lifeMessageMapper.selectCount(wrapper) <= 1;
|
|
|
|
|
|
|
|
// 查询我发送过的消息
|
|
// 查询我发送过的消息
|
|
|
-// QueryWrapper<LifeMessage> wrapper = new QueryWrapper<>();
|
|
|
|
|
-// //本人发送的数量
|
|
|
|
|
-// wrapper.apply("(sender_id = '" + senderId + "' and receiver_id = '" + receiverId + "')");
|
|
|
|
|
-//// wrapper.eq("sender_id", senderId);
|
|
|
|
|
-//// wrapper.eq("receiver_id", receiverId);
|
|
|
|
|
-//
|
|
|
|
|
-// int senderCount = lifeMessageMapper.selectCount(wrapper);
|
|
|
|
|
-// //查询对方发送过的消息
|
|
|
|
|
-// QueryWrapper<LifeMessage> wrapper1 = new QueryWrapper<>();
|
|
|
|
|
-// wrapper1.apply("(sender_id = '" + receiverId + "' and receiver_id = '" + senderId + "')");
|
|
|
|
|
-// int receiverCount = lifeMessageMapper.selectCount(wrapper1);
|
|
|
|
|
-// if (senderCount == 0){
|
|
|
|
|
-// //本条可以发
|
|
|
|
|
-// return "1";
|
|
|
|
|
-// }
|
|
|
|
|
-// senderCount++;
|
|
|
|
|
-// // 可以一直唠
|
|
|
|
|
-// if (senderCount >= 1 && receiverCount >= 1){
|
|
|
|
|
-// // 发送本条消息并可以一直发
|
|
|
|
|
-// return "2";
|
|
|
|
|
-// }
|
|
|
|
|
-// // 本人发过了,等待对方发
|
|
|
|
|
-// if (senderCount > 1 && receiverCount==0){
|
|
|
|
|
-// // 不允许发送本条消息
|
|
|
|
|
-// return "0";
|
|
|
|
|
-// }
|
|
|
|
|
-
|
|
|
|
|
-// return "0";
|
|
|
|
|
|
|
+ QueryWrapper<LifeMessage> wrapper = new QueryWrapper<>();
|
|
|
|
|
+ //本人发送的数量
|
|
|
|
|
+ wrapper.apply("(sender_id = '" + senderId + "' and receiver_id = '" + receiverId + "')");
|
|
|
|
|
+// wrapper.eq("sender_id", senderId);
|
|
|
|
|
+// wrapper.eq("receiver_id", receiverId);
|
|
|
|
|
+
|
|
|
|
|
+ int senderCount = lifeMessageMapper.selectCount(wrapper);
|
|
|
|
|
+ //查询对方发送过的消息
|
|
|
|
|
+ QueryWrapper<LifeMessage> wrapper1 = new QueryWrapper<>();
|
|
|
|
|
+ wrapper1.apply("(sender_id = '" + receiverId + "' and receiver_id = '" + senderId + "')");
|
|
|
|
|
+ int receiverCount = lifeMessageMapper.selectCount(wrapper1);
|
|
|
|
|
+ if (senderCount == 0){
|
|
|
|
|
+ //本条可以发
|
|
|
|
|
+ return "1";
|
|
|
|
|
+ }
|
|
|
|
|
+ senderCount++;
|
|
|
|
|
+ // 可以一直唠
|
|
|
|
|
+ if (senderCount >= 1 && receiverCount >= 1){
|
|
|
|
|
+ // 发送本条消息并可以一直发
|
|
|
|
|
+ return "2";
|
|
|
|
|
+ }
|
|
|
|
|
+ // 本人发过了,等待对方发
|
|
|
|
|
+ if (senderCount > 1 && receiverCount==0){
|
|
|
|
|
+ // 不允许发送本条消息
|
|
|
|
|
+ return "0";
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return "0";
|
|
|
|
|
|
|
|
// 陌生人不限制一条消息
|
|
// 陌生人不限制一条消息
|
|
|
- return "2";
|
|
|
|
|
|
|
+// return "2";
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
log.error("LifeMessageServiceImpl.isStranger Error Mgs={}", e.getMessage());
|
|
log.error("LifeMessageServiceImpl.isStranger Error Mgs={}", e.getMessage());
|
|
|
throw new Exception(e);
|
|
throw new Exception(e);
|