消息、通知、交易

alien-second/src/main/java/shop/alien/second/service/impl/SecondTradeRecordServiceImpl.java

@@ -405,6 +405,7 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
         try {
             int userId = Objects.requireNonNull(JwtUtil.getCurrentUserInfo()).getInteger("userId");
             QueryWrapper<SecondTradeRecord> wrapper = new QueryWrapper<>();
+            wrapper.eq("trade.delete_flag", 0);
             wrapper.apply("(trade.buyer_id = '" + sideId + "' and trade.seller_id = '" + userId + "') || (trade.buyer_id = '" + userId + "' and trade.seller_id = '" + sideId + "')");
             wrapper.orderByDesc("trade.created_time");
             return secondTradeRecordMapper.getTradeRecord(wrapper);

alien-store/src/main/java/shop/alien/store/service/impl/LifeMessageServiceImpl.java

@@ -96,7 +96,7 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
                 wrapper.apply("message.phoneId in ( " +
                         "    select receiver_id " +
                         "    from life_message " +
-                        "    where sender_id = '" + receiverId + "'" +
+                        "    where sender_id = '" + receiverId + "'  and delete_flag = 0 " +
                         "    group by receiver_id " +
                         ")");
                 // 没聊过
@@ -104,7 +104,7 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
                 wrapper.apply("message.phoneId not in ( " +
                         "    select receiver_id " +
                         "    from life_message " +
-                        "    where sender_id = '" + receiverId + "'" +
+                        "    where sender_id = '" + receiverId + "'  and delete_flag = 0 " +
                         "    group by receiver_id " +
                         ")");
             }