修改小程序聊天窗口删除bug

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/MessageController.java

@@ -102,8 +102,8 @@ public class MessageController  extends BaseController{
     @ApiOperation(value = "用户列表——用户移除")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("/removeUser")
-    public ResultBody removeUser(HttpServletRequest request,@ApiParam(value = "接收人ID") @RequestParam Integer receiverUserId){
-        return messageService.removeUser(this.getUserLoginInfoFromRedis(request).getUserAccountId(),receiverUserId);
+    public ResultBody removeUser(HttpServletRequest request, @ApiParam(value = "接收人ID") @RequestParam Integer receiverUserId, @RequestParam Integer backUserId) {
+        return messageService.removeUser(this.getUserLoginInfoFromRedis(request).getUserAccountId(), receiverUserId, backUserId);
     }
     @ApiOperation(value = "用户撤回消息（三分钟之内可以撤回）")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/MessageDao.java

@@ -104,7 +104,7 @@ public interface MessageDao {
     int removeUserMessage(Integer id);
 
     int insertUserMessageLog(UserMessageLogDO userMessageLogDO);
-    Integer isUserMessageLog(@Param("receiverUserId") Integer receiverUserId,@Param("senderUserId") Integer senderUserId,@Param("backUserId") Integer backUserId);
+    Integer isUserMessageLog(@Param("receiverUserId") Integer receiverUserId, @Param("senderUserId") Integer senderUserId, @Param("backUserId") Integer backUserId);
 
     int updateUserMessageLog(@Param("id") Integer logId);
     int updateUserMessageCount(@Param("id") Integer logId);

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/MessageService.java

@@ -81,7 +81,7 @@ public interface MessageService {
 
     ResultBody removeUserMessage(Integer id);
 
-    ResultBody removeUser(Integer senderUserId, Integer receiverUserId);
+    ResultBody removeUser(Integer senderUserId, Integer receiverUserId, Integer backUserId);
 
 //    ResultBody purchaseTime(Integer userAccountId, MessageTimeVO messageTimeVO, String token);
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/MessageServiceImpl.java

@@ -284,9 +284,9 @@ public class MessageServiceImpl implements MessageService {
     }
 
     @Override
-    public ResultBody removeUser(Integer senderUserId, Integer receiverUserId) {
-        Integer logId = messageDao.isUserMessageLog(receiverUserId,senderUserId,null);
-        if(logId != null){
+    public ResultBody removeUser(Integer senderUserId, Integer receiverUserId, Integer backUserId) {
+        Integer logId = messageDao.isUserMessageLog(receiverUserId, senderUserId, backUserId);
+        if (logId != null) {
             messageDao.removeUserMessageLog(logId);
             return ResultBody.success("删除成功");
         }

csm-service/cms-service-user/src/main/resources/mapper/MessageDao.xml

@@ -80,13 +80,13 @@ ORDER BY create_time desc
     <select id="isUserMessageLog" resultType="java.lang.Integer">
         select id
         from user_message_log
-        where sender_user_id = #{senderUserId} and receiver_user_id = #{receiverUserId}
-          and
-            case
-                when #{backUserId} is not null then back_user_id = #{backUserId}
-                else back_user_id is null
-                end
-         limit 1
+        where sender_user_id = #{senderUserId}
+          and receiver_user_id = #{receiverUserId}
+          and case
+                  when #{backUserId} is not null then back_user_id = #{backUserId}
+                  else back_user_id is null
+            end
+            limit 1
     </select>
     <select id="selectUserList" resultType="com.mmc.iuav.user.entity.UserMessageLogDO">
         select *