商品资料数据part1

src/main/java/com/caimei365/commodity/model/vo/ArchiveDetailVo.java

@@ -29,11 +29,7 @@ public class ArchiveDetailVo implements Serializable {
      */
     List<ArchiveContentVo> fileArchiveList;
     /**
-     * 查看权限:0不能查看，1可以查看
+     * 查看权限:0可查看，1未登录，2需升级会员机构，3需升级医美会员机构，4需要抵扣采美豆，5无权限查看
      */
     Integer permission;
-    /**
-     * 提示类型：0未登录，1需升级会员机构，2需升级医美会员机构，3需要抵扣采美豆，4无权限查看
-     */
-    Integer tipType;
 }

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -879,29 +879,27 @@ public class PageServiceImpl implements PageService {
     @Override
     public ResponseJson<ArchiveDetailVo> getArchiveDetail(Integer archiveId, Integer userId) {
         // 判断该用户是否拥有访问该资料的权限
-        Map<String,Integer> permissionMap = checkArchivePermission(archiveId, userId);
-        Integer permission = permissionMap.get("permission");
-        Integer tipType = permissionMap.get("tipType");
+        Integer permission = checkArchivePermission(archiveId, userId);
         List<ArchiveContentVo> imageArchiveList = pageMapper.getImageArchiveList(archiveId);
         List<ArchiveContentVo> videoArchiveList = pageMapper.getVideoArchiveList(archiveId);
         List<ArchiveContentVo> fileArchiveList = pageMapper.getFileArchiveList(archiveId);
         imageArchiveList.forEach(imageArchive->{
             List<String> imageList = pageMapper.getArchiveImageList(imageArchive.getArchiveContentId());
-            if (1 == permission) {
+            if (0 == permission) {
                 imageArchive.setImageList(imageList);
             }
             imageArchive.setImageNum(imageList.size());
         });
         videoArchiveList.forEach(videoArchive->{
             ArchiveFilePo archiveFile = pageMapper.getArchiveFile(videoArchive.getArchiveContentId());
-            if (1 == permission) {
+            if (0 == permission) {
                 videoArchive.setFileUrl(archiveFile.getFileUrl());
             }
         });
         fileArchiveList.forEach(fileArchive->{
             ArchiveFilePo archiveFile = pageMapper.getArchiveFile(fileArchive.getArchiveContentId());
             fileArchive.setFileName(archiveFile.getFileName());
-            if (1 == permission) {
+            if (0 == permission) {
                 fileArchive.setFileUrl(archiveFile.getFileUrl());
             }
         });
@@ -910,12 +908,10 @@ public class PageServiceImpl implements PageService {
         archiveDetail.setVideoArchiveList(videoArchiveList);
         archiveDetail.setFileArchiveList(fileArchiveList);
         archiveDetail.setPermission(permission);
-        archiveDetail.setTipType(tipType);
         return ResponseJson.success(archiveDetail);
     }
 
-    private Map<String, Integer> checkArchivePermission(Integer archiveId, Integer userId) {
-        HashMap<String, Integer> permissionMap = new HashMap<>(2);
+    private Integer checkArchivePermission(Integer archiveId, Integer userId) {
         ArchivePo archive = pageMapper.getArchiveByArchiveId(archiveId);
         //资料等级：1一类资料，2二类资料，3三类资料
         Integer archiveLevel = archive.getArchiveLevel();
@@ -925,54 +921,44 @@ public class PageServiceImpl implements PageService {
         Integer identity = priceMapper.getIdentityByUserId(userId);
         // 1生美机构，2医美机构
         Integer clubType = pageMapper.getClubTypeByUserId(userId);
-        // permission:0不能查看，1可以查看
-        // tipType:0未登录，1需升级会员机构，2需升级医美会员机构，3需要抵扣采美豆，4无权限查看
+        // permission:0可查看，1未登录，2需升级会员机构，3需升级医美会员机构，4需要抵扣采美豆，5无权限查看
+        Integer permission = null;
         if (null == identity) {
             // 未登录
-            permissionMap.put("permission", 0);
-            permissionMap.put("tipType", 0);
+            permission = 1;
         } else if (1 == identity) {
             //协销可查看所有资料
-            permissionMap.put("permission", 1);
-            permissionMap.put("tipType", null);
-        } else if (4 == identity) {
+            permission = 0;
+        } else if (5 == identity) {
             // 普通机构
             if (archiveLevel > 1) {
                 // 二级资料，普通机构
-                permissionMap.put("permission", 0);
-                permissionMap.put("tipType", 1 == productClassify ? 1 : 2);
+                permission = 1 == productClassify ? 2 : 3;
             } else {
-                permissionMap.put("permission", 1);
-                permissionMap.put("tipType", null);
+                permission = 0;
             }
-        } else if (3 == identity) {
+        } else if (2 == identity) {
             // 会员机构
-            if (2 == archiveLevel && 2 == productClassify && 1 == clubType) {
+            if (2 == archiveLevel && 2 == productClassify && (0 == clubType || 1 == clubType)) {
                 // 二级医美资料，生美会员机构
-                permissionMap.put("permission", 0);
-                permissionMap.put("tipType", 2);
+                permission = 3;
             } else if (3 == archiveLevel) {
                 // 查询用户对该资料的抵扣记录
                 Integer historyId = pageMapper.findBeansHistoryByArchiveId(userId, archiveId);
-                if (2 == productClassify && 1 == clubType) {
+                if (2 == productClassify && (0 == clubType || 1 == clubType)) {
                     // 三级医美资料，生美会员机构
-                    permissionMap.put("permission", 0);
-                    permissionMap.put("tipType", 2);
+                    permission = 3;
                 } else if (null == historyId){
-                    permissionMap.put("permission", 0);
-                    permissionMap.put("tipType", 3);
+                    permission = 4;
                 } else {
-                    permissionMap.put("permission", 1);
-                    permissionMap.put("tipType", null);
+                    permission = 0;
                 }
             } else {
-                permissionMap.put("permission", 1);
-                permissionMap.put("tipType", null);
+                permission = 0;
             }
         } else{
-            permissionMap.put("permission", 0);
-            permissionMap.put("tipType", null);
+            permission = 5;
         }
-        return permissionMap;
+        return permission;
     }
 }

src/main/resources/mapper/PageMapper.xml

@@ -458,7 +458,7 @@
         where cpa.id = #{archiveId}
     </select>
     <select id="getClubTypeByUserId" resultType="java.lang.Integer">
-        select firstClubType from club
+        select ifnull(firstClubType,0) from club where userID = #{userId}
     </select>
     <select id="getArchiveIdById" resultType="java.lang.Integer">
         select id from cm_product_archive where productId = #{productId}