Merge branch 'fix-rsy-1002780' into 'master'

加开关

See merge request rays/pcloud-book!650

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/entity/RightsSetting.java

@@ -24,6 +24,16 @@ public class RightsSetting extends BaseTempletClassify {
 
     private Long subjectLabelId;
 
+    @ApiModelProperty("线上网课是否开启")
+    private Boolean onlineCourseOpen;
+
+    @ApiModelProperty("学习工具是否开启")
+    private Boolean learningToolOpen;
+
+    @ApiModelProperty("抽奖是否开启")
+    private Boolean drawNowOpen;
+
+
     @ApiModelProperty("线上网课集合")
     private List<RightsNowItem> onlineCourseNowItems;
 

pcloud-service-book/src/main/resources/mapper/rightssetting/RightsSettingMapper.xml

@@ -15,6 +15,9 @@
     <result column="enable_group_service" property="enableGroupService" jdbcType="INTEGER" />
     <result column="rights_setting_type" property="rightsSettingType" jdbcType="INTEGER" />
     <result column="book_id" property="bookId" jdbcType="BIGINT" />
+    <result column="online_course_open" property="onlineCourseOpen" jdbcType="BOOLEAN" />
+    <result column="learning_tool_open" property="learningToolOpen" jdbcType="BOOLEAN" />
+    <result column="draw_open" property="drawNowOpen" jdbcType="BOOLEAN" />
   </resultMap>
   
   <resultMap id="DtoResultMap" type="com.pcloud.book.rightsSetting.dto.RightsSettingDto">
@@ -32,10 +35,14 @@
     <result column="rights_setting_type" property="rightsSettingType" jdbcType="INTEGER" />
     <result column="book_id" property="bookId" jdbcType="BIGINT" />
     <result column="BOOK_NAME" property="bookName" jdbcType="VARCHAR" />
+    <result column="online_course_open" property="onlineCourseOpen" jdbcType="BOOLEAN" />
+    <result column="learning_tool_open" property="learningToolOpen" jdbcType="BOOLEAN" />
+    <result column="draw_open" property="drawNowOpen" jdbcType="BOOLEAN" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, introduce, detail, count, first_classify, second_classify, grade_label_id, subject_label_id,
     create_time, update_time, enable_group_service, rights_setting_type, book_id
+    ,online_course_open,learning_tool_open,draw_open
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
     select
@@ -51,11 +58,13 @@
     insert into rights_setting (introduce, detail,
       count, first_classify, second_classify,
       grade_label_id, subject_label_id, create_time,
-      update_time, enable_group_service, rights_setting_type, book_id)
+      update_time, enable_group_service, rights_setting_type, book_id,
+      online_course_open,learning_tool_open,draw_open)
     values ( #{introduce,jdbcType=VARCHAR}, #{detail,jdbcType=VARCHAR},
       #{count,jdbcType=INTEGER}, #{firstClassify,jdbcType=BIGINT}, #{secondClassify,jdbcType=BIGINT},
       #{gradeLabelId,jdbcType=BIGINT}, #{subjectLabelId,jdbcType=BIGINT}, now(),
-      #{updateTime,jdbcType=TIMESTAMP}, #{enableGroupService}, #{rightsSettingType}, #{bookId})
+      #{updateTime,jdbcType=TIMESTAMP}, #{enableGroupService}, #{rightsSettingType}, #{bookId},
+      #{onlineCourseOpen},#{learningToolOpen},#{drawNowOpen})
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.book.rightsSetting.entity.RightsSetting" >
     update rights_setting
@@ -96,6 +105,15 @@
       <if test="bookId != null" >
         book_id = #{bookId},
       </if>
+      <if test="onlineCourseOpen != null" >
+        online_course_open = #{onlineCourseOpen},
+      </if>
+      <if test="learningToolOpen != null" >
+        learning_tool_open = #{learningToolOpen},
+      </if>
+      <if test="drawNowOpen != null" >
+        draw_open = #{drawNowOpen}
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -110,7 +128,10 @@
       subject_label_id = #{subjectLabelId,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       enable_group_service = #{enableGroupService},
-      book_id = #{bookId}
+      book_id = #{bookId},
+      online_course_open = #{onlineCourseOpen},
+      learning_tool_open = #{learningToolOpen},
+      draw_open = #{drawNowOpen}
     where id = #{id,jdbcType=BIGINT}
   </update>