内容库V1.0.0

src/main/java/com/caimei365/user/controller/LoginApi.java

@@ -300,9 +300,10 @@ public class LoginApi {
     public ResponseJson<PageInfo<MessageCenter>> SpMessageList(Integer commonId,
                                                                Integer messageType,
                                                                Integer source,
+                                                               Integer type,
                                                                @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                                @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
-        return loginService.SpMessageList(commonId, messageType, source, pageNum, pageSize);
+        return loginService.SpMessageList(commonId, messageType, source,type, pageNum, pageSize);
     }
 
     @ApiOperation("机构站内消息列表")

src/main/java/com/caimei365/user/mapper/MessageCenterMapper.java

@@ -50,7 +50,7 @@ public interface MessageCenterMapper {
      */
     Integer listingfeeExpire(Integer shopID);
 
-    List<MessageCenter> MessageList(Integer userType,Integer messageType,Integer commonId);
+    List<MessageCenter> MessageList(Integer userType,Integer messageType,Integer commonId,Integer type);
 
     String contractMobile(Integer clubID);
 

src/main/java/com/caimei365/user/service/LoginService.java

@@ -86,7 +86,7 @@ public interface LoginService {
      */
     ResponseJson<UserLoginVo> appletsOrganizeAuthorization(String code, String encryptedData, String iv, HttpHeaders headers) throws ParseException;
 
-    ResponseJson<PageInfo<MessageCenter>> SpMessageList(Integer commonId,Integer messageType,Integer source, int pageNum, int pageSize);
+    ResponseJson<PageInfo<MessageCenter>> SpMessageList(Integer commonId,Integer messageType,Integer source,Integer type, int pageNum, int pageSize);
     ResponseJson<PageInfo<MessageCenter>> ClubMessageList(Integer commonId,Integer messageType,Integer source, int pageNum, int pageSize);
 
     ResponseJson<PageInfo<MessageCenter>> shopMessageList(Integer commonId,Integer messageType,Integer source, int pageNum, int pageSize);

src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -645,9 +645,9 @@ public class LoginServiceImpl implements LoginService {
         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,Integer type, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<MessageCenter> list = messageCenterMapper.MessageList(3, messageType, commonId);
+        List<MessageCenter> list = messageCenterMapper.MessageList(3, messageType, commonId,type);
         list.forEach(mess -> {
             if (null != mess.getClubId()) {
                 MessageCenter messageCenter = messageCenterMapper.MainImage(3, commonId, mess.getOrderId());
@@ -676,7 +676,7 @@ public class LoginServiceImpl implements LoginService {
     @Override
     public ResponseJson<PageInfo<MessageCenter>> ClubMessageList(Integer commonId, Integer messageType, Integer source, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<MessageCenter> list = messageCenterMapper.MessageList(1, messageType, commonId);
+        List<MessageCenter> list = messageCenterMapper.MessageList(1, messageType, commonId,null);
         list.forEach(mess -> {
             if (null != mess.getClubId()) {
                 MessageCenter messageCenter = messageCenterMapper.MainImage(1, commonId, mess.getOrderId());
@@ -711,7 +711,7 @@ public class LoginServiceImpl implements LoginService {
     @Override
     public ResponseJson<PageInfo<MessageCenter>> shopMessageList(Integer commonId, Integer messageType, Integer source, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<MessageCenter> list = messageCenterMapper.MessageList(2, messageType, commonId);
+        List<MessageCenter> list = messageCenterMapper.MessageList(2, messageType, commonId,null);
         list.forEach(mess -> {
             String shopName = messageCenterMapper.shopName(commonId);
             MessageCenter messageCenter = messageCenterMapper.productImage(mess.getProductId(), commonId);
@@ -1658,7 +1658,7 @@ public class LoginServiceImpl implements LoginService {
      * 初始化站内信
      */
     private List<MessageCenter> setMessageList(Integer userType,Integer messageType,Integer commonId) {
-        List<MessageCenter> list = messageCenterMapper.MessageList(userType, messageType, commonId);
+        List<MessageCenter> list = messageCenterMapper.MessageList(userType, messageType, commonId,null);
         list.forEach(mess -> {
             if (null != mess.getOrderId()) {
                 MessageCenter messageCenter = messageCenterMapper.MainImage(userType, commonId, mess.getOrderId());

src/main/resources/mapper/MessageCenter.xml

@@ -109,6 +109,14 @@
         <where>
             <if test="messageType !=null">
                 AND messageType=#{messageType}
+                <if test="messageType == 3 ">
+                    <if test="type ==1 ">
+                        and shopTieredType in(9,10)
+                    </if>
+                    <if test="type ==null ">
+                        and shopTieredType not in(9,10)
+                    </if>
+                </if>
             </if>
             <if test="userType == 1">
                 and clubID=#{commonId}