添加作品应用类型

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/ProductTypeConstant.java

@@ -183,11 +183,6 @@ public class ProductTypeConstant {
     public static final String PBMUSIC = "PBMUSIC";
 
     /**
-     * 绘本资源
-     */
-    public static final String MUSIC = "MUSIC";
-
-    /**
      * 一对一辅导
      */
     public static final String TUTORIAL = "TUTORIAL";
@@ -283,6 +278,11 @@ public class ProductTypeConstant {
     public static final String MEMBER_APP = "MEMBER_APP";
 
     /**
+     * 绘本故事
+     */
+    public static final String PBSTORY = "PBSTORY";
+
+    /**
      * 课文诵读
      */
     public static final String ARTICLE_READING = "ARTICLE_READING";
@@ -293,6 +293,21 @@ public class ProductTypeConstant {
     public static final String ENGLISH_WALKMAN = "ENGLISH_WALKMAN";
 
     /**
+     * 口语评测Oral evaluation
+     */
+    public static final String ORAL_EVALUATION = "ORAL_EVALUATION";
+
+    /**
+     * 微信学习群
+     */
+    public static final String BOOK_GROUP = "BOOK_GROUP";
+
+    /**
+     * 延伸阅读
+     */
+    public static final String PDF_APP = "PDF_APP";
+
+    /**
      * 热门作品类型
      */
     public static final String[] HOT_PRODUCT_TYPE = {QA, PDF, VIDEO, PRETEST};
@@ -320,7 +335,7 @@ public class ProductTypeConstant {
     public static final String[] APP_PRODUCT = {LOOK, LIVE, TUTOR, GROUP, ZSCORE, VOTE, CLOCK, TEST, AUDIOAPP, ANSWER,
             EF, VIDEO_COURSE, PRETESTAPP, AUDIO_RESOURCE, QA_APP, EBOOK_APP, AUDIO_MAGIC, TEACH_RESOURCE_APP,
             COURSE_WARE, TEST_PAPER_APP, MATCH_LISTEN, WORD_DICTATION, STROKE_ORDER_APP, IMAGE_APP, MEMBER_APP,
-            ARTICLE_READING,ENGLISH_WALKMAN};
+            ARTICLE_READING, ENGLISH_WALKMAN, ORAL_EVALUATION, PBSTORY, PDF_APP};
 
     /**
      * 数据平台埋点型作品

pcloud-common-core/src/main/java/com/pcloud/common/core/enums/AppProductTypeEnum.java

@@ -32,7 +32,9 @@ public enum AppProductTypeEnum {
     IMAGE(AppTypeEnum.IMAGE.value, ProductTypeConstant.IMAGE_APP),
     MEMBER(AppTypeEnum.MEMBER.value, ProductTypeConstant.MEMBER_APP),
     ARTICLE_READING(AppTypeEnum.ARTICLE_READING.value, ProductTypeConstant.ARTICLE_READING),
-    ENGLISH_WALKMAN(AppTypeEnum.ENGLISH_WALKMAN.value, ProductTypeConstant.ENGLISH_WALKMAN);
+    ENGLISH_WALKMAN(AppTypeEnum.ENGLISH_WALKMAN.value, ProductTypeConstant.ENGLISH_WALKMAN),
+    ORAL_EVALUATION(AppTypeEnum.ORAL_EVALUATION.value, ProductTypeConstant.ORAL_EVALUATION),
+    PDF(AppTypeEnum.PDF.value, ProductTypeConstant.PDF_APP);
 
     public final String appTypeCode;
 
@@ -82,4 +84,16 @@ public enum AppProductTypeEnum {
         }
         return null;
     }
+
+    /**
+     * 会员应用可设置会员免费的作品类型
+     */
+    public static final String[] MEMBER_INCLUDE_PRODUCT_TYPE = {ProductTypeConstant.PDF, ProductTypeConstant.AUDIO, ProductTypeConstant.VIDEO, ProductTypeConstant.PRETEST, ProductTypeConstant.ARTICLE,
+            ProductTypeConstant.FORMAT, ProductTypeConstant.ALBUM, ProductTypeConstant.BOOK, ProductTypeConstant.EBOOK, ProductTypeConstant.VIDEO_SCHEDULE};
+
+    /**
+     * 会员应用可设置会员免费的应用类型
+     */
+    public static final String[] MEMBER_INCLUDE_APP_TYPE = {AppTypeEnum.ANSWER.value, AppTypeEnum.ITEM_BANK.value, AppTypeEnum.EBOOK.value, AppTypeEnum.TEACH_RESOURCE.value, AppTypeEnum.COURSE_WARE.value,
+            AppTypeEnum.TEST_PAPER.value};
 }

pcloud-common/src/main/java/com/pcloud/common/enums/AppTypeEnum.java

@@ -62,10 +62,14 @@ public enum AppTypeEnum {
     MATCH_LISTEN("MATCH_LISTEN"),  //配套听力
     WORD_DICTATION("WORD_DICTATION"),    //生词听写
     STROKE_ORDER("STROKE_ORDER"),     //笔顺动图
+    ARTICLE_READING("ARTICLE_READING"), //课文诵读
+    ENGLISH_WALKMAN("ENGLISH_WALKMAN"), //英语随身听
     WECHAT_STUDY_GROUP("WECHAT_STUDY_GROUP"), // 微信学习交流圈
     TASK_CLOCK("TASK_CLOCK"), //任务打卡
     REWARD_CLOCK("REWARD_CLOCK"), //奖励打卡
     CUSTOM_CLOCK("CUSTOM_CLOCK"), //自定义打卡
+ 	MEMBER("MEMBER"), //开通会员
+    ORAL_EVALUATION("ORAL_EVALUATION"), //口语评测
     PIC_NOTE("PIC_NOTE"); // 图文应用
 
     /**