Browse Source

小需求优化V1.3.13

kaick 1 year ago
parent
commit
257bda0abd

+ 14 - 3
src/main/java/com/caimei365/user/controller/LoginApi.java

@@ -251,6 +251,15 @@ public class LoginApi {
     public ResponseJson<Map<String, Object>> heheOneMessageCount(Integer messageType, Integer commonId) {
     public ResponseJson<Map<String, Object>> heheOneMessageCount(Integer messageType, Integer commonId) {
         return loginService.count(4,messageType, commonId);
         return loginService.count(4,messageType, commonId);
     }
     }
+    @ApiOperation("颜选美学站内消息改为已读")
+    @GetMapping("/auth/updateHeheMessageAsRead")
+    public ResponseJson<Void> updateHeheMessageAsRead(Integer messageType, Integer commonId) {
+        Integer i = loginService.updateMessageAsRead(4,messageType, commonId);
+        if (i <= 0) {
+            return ResponseJson.error("没有未读消息了!", null);
+        }
+        return ResponseJson.success("标记已读成功", null);
+    }
 
 
     @ApiOperation("机构站内消息未读消息记录数")
     @ApiOperation("机构站内消息未读消息记录数")
     @GetMapping("/auth/ClubMessageCount")
     @GetMapping("/auth/ClubMessageCount")
@@ -321,17 +330,19 @@ public class LoginApi {
     @ApiOperation("机构站内消息改为已读")
     @ApiOperation("机构站内消息改为已读")
     @GetMapping("/auth/updateMessageAsRead")
     @GetMapping("/auth/updateMessageAsRead")
     public ResponseJson<Void> updateMessageAsRead(Integer messageType, Integer commonId) {
     public ResponseJson<Void> updateMessageAsRead(Integer messageType, Integer commonId) {
-        Integer i = loginService.updateMessageAsRead(messageType, commonId);
+        Integer i = loginService.updateMessageAsRead(1,messageType, commonId);
         if (i <= 0) {
         if (i <= 0) {
             return ResponseJson.error("没有未读消息了!", null);
             return ResponseJson.error("没有未读消息了!", null);
         }
         }
         return ResponseJson.success("标记已读成功", null);
         return ResponseJson.success("标记已读成功", null);
     }
     }
 
 
+
+
     @ApiOperation("供应商站内消息改为已读")
     @ApiOperation("供应商站内消息改为已读")
     @GetMapping("/auth/updateShopMessageAsRead")
     @GetMapping("/auth/updateShopMessageAsRead")
     public ResponseJson<Void> updateShopMessageAsRead(Integer messageType, Integer commonId) {
     public ResponseJson<Void> updateShopMessageAsRead(Integer messageType, Integer commonId) {
-        Integer i = loginService.updateShopMessageAsRead(messageType, commonId);
+        Integer i = loginService.updateMessageAsRead(2,messageType, commonId);
         if (i <= 0) {
         if (i <= 0) {
             return ResponseJson.error("没有未读消息了!", null);
             return ResponseJson.error("没有未读消息了!", null);
         }
         }
@@ -340,7 +351,7 @@ public class LoginApi {
     @ApiOperation("协销站内消息改为已读")
     @ApiOperation("协销站内消息改为已读")
     @GetMapping("/auth/updateSpMessageAsRead")
     @GetMapping("/auth/updateSpMessageAsRead")
     public ResponseJson<Void> updateSpMessageAsRead(Integer messageType, Integer commonId) {
     public ResponseJson<Void> updateSpMessageAsRead(Integer messageType, Integer commonId) {
-        Integer i = loginService.updateSpMessageAsRead(messageType, commonId);
+        Integer i = loginService.updateMessageAsRead(3,messageType, commonId);
         if (i <= 0) {
         if (i <= 0) {
             return ResponseJson.error("没有未读消息了!", null);
             return ResponseJson.error("没有未读消息了!", null);
         }
         }

+ 1 - 3
src/main/java/com/caimei365/user/service/LoginService.java

@@ -104,10 +104,8 @@ public interface LoginService {
     ResponseJson<Map<String, Object>> ShopCount(Integer messageType,Integer commonId);
     ResponseJson<Map<String, Object>> ShopCount(Integer messageType,Integer commonId);
     ResponseJson<Map<String, Object>> ClubCount(Integer messageType,Integer commonId);
     ResponseJson<Map<String, Object>> ClubCount(Integer messageType,Integer commonId);
 
 
-     Integer updateMessageAsRead(Integer messageType,Integer commonId);
+     Integer updateMessageAsRead(Integer userType,Integer messageType,Integer commonId);
 
 
-    Integer updateShopMessageAsRead(Integer messageType,Integer commonId);
-    Integer updateSpMessageAsRead(Integer messageType,Integer commonId);
 
 
      Integer updateRead(Integer userType,String Id);
      Integer updateRead(Integer userType,String Id);
 
 

+ 4 - 13
src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -601,19 +601,6 @@ public class LoginServiceImpl implements LoginService {
     }
     }
 
 
 
 
-    @Override
-    public Integer updateMessageAsRead(Integer messageType, Integer commonId) {
-        return messageCenterMapper.updateMessageAsRead(1, messageType, commonId);
-    }
-
-    @Override
-    public Integer updateShopMessageAsRead(Integer messageType, Integer commonId) {
-        return messageCenterMapper.updateMessageAsRead(2, messageType, commonId);
-    }
-    @Override
-    public Integer updateSpMessageAsRead(Integer messageType, Integer commonId) {
-        return messageCenterMapper.updateMessageAsRead(3, messageType, commonId);
-    }
 
 
     @Override
     @Override
     public Integer deleteMessage(String id) {
     public Integer deleteMessage(String id) {
@@ -654,6 +641,10 @@ public class LoginServiceImpl implements LoginService {
         return ResponseJson.success(map);
         return ResponseJson.success(map);
     }
     }
     @Override
     @Override
+    public Integer updateMessageAsRead(Integer userType,Integer messageType, Integer commonId) {
+        return messageCenterMapper.updateMessageAsRead(userType, messageType, commonId);
+    }
+    @Override
     public ResponseJson<PageInfo<MessageCenter>> SpMessageList(Integer commonId, Integer messageType, Integer source, int pageNum, int pageSize) {
     public ResponseJson<PageInfo<MessageCenter>> SpMessageList(Integer commonId, Integer messageType, Integer source, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         PageHelper.startPage(pageNum, pageSize);
         List<MessageCenter> list = messageCenterMapper.MessageList(3, messageType, commonId);
         List<MessageCenter> list = messageCenterMapper.MessageList(3, messageType, commonId);