Merge branch 'feature/1005314' into 'master'

feat: [1005314] 编辑运营需求（版权保护支付、应用有效期）

See merge request rays/pcloud-book!1389

pcloud-service-book/src/main/java/com/pcloud/book/copyright/entity/BookAuthInfo.java

@@ -72,4 +72,6 @@ public class BookAuthInfo extends BaseEntity {
     @ApiModelProperty("授权后仍需付费")
     private Integer isAuthorizedPay;
 
+    @ApiModelProperty("打开支付功能；0：关闭；1：开启；")
+    private Integer openPay;
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/vo/BookAuthInfoAndServesVO.java

@@ -55,6 +55,8 @@ public class BookAuthInfoAndServesVO implements Serializable {
     @ApiModelProperty("授权后仍需付费")
     private Integer isAuthorizedPay;
 
+    @ApiModelProperty("打开支付功能；0：关闭；1：开启；")
+    private Integer openPay;
 
     public Long getId() {
         return id;
@@ -160,6 +162,14 @@ public class BookAuthInfoAndServesVO implements Serializable {
         this.isAuthorizedPay = isAuthorizedPay;
     }
 
+    public Integer getOpenPay() {
+        return openPay;
+    }
+
+    public void setOpenPay(Integer openPay) {
+        this.openPay = openPay;
+    }
+
     @Override
     public String toString() {
         return "BookAuthInfoAndServesVO{" +

pcloud-service-book/src/main/java/com/pcloud/book/copyright/vo/BookAuthInfoVO.java

@@ -50,4 +50,7 @@ public class BookAuthInfoVO implements Serializable {
     @ApiModelProperty("授权后仍需付费")
     private Integer isAuthorizedPay;
 
+    @ApiModelProperty("打开支付功能；0：关闭；1：开启；")
+    private Integer openPay;
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/vo/BookAuthInfoWechatVO.java

@@ -51,6 +51,9 @@ public class BookAuthInfoWechatVO implements Serializable {
     @ApiModelProperty("coverImg")
     private String coverImg;
 
+    @ApiModelProperty("打开支付功能；0：关闭；1：开启；")
+    private Integer openPay;
+
     public Long getId() {
         return id;
     }
@@ -147,6 +150,14 @@ public class BookAuthInfoWechatVO implements Serializable {
         this.coverImg = coverImg;
     }
 
+    public Integer getOpenPay() {
+        return openPay;
+    }
+
+    public void setOpenPay(Integer openPay) {
+        this.openPay = openPay;
+    }
+
     @Override
     public String toString() {
         return "BookAuthInfoWechatVO{" +

pcloud-service-book/src/main/java/com/pcloud/book/copyright/vo/SetAuthOpenParam.java

@@ -54,4 +54,7 @@ public class SetAuthOpenParam implements Serializable {
     @ApiModelProperty("授权后仍需付费")
     private Integer isAuthorizedPay;
 
+    @ApiModelProperty("打开支付功能；0：关闭；1：开启；")
+    private Integer openPay;
+
 }

pcloud-service-book/src/main/resources/mapper/copyright/BookAuthInfo.Mapper.xml

@@ -14,23 +14,24 @@
         <result column="BOOK_STATUS" property="bookStatus" jdbcType="TINYINT" />
         <result column="check_type" property="checkType" jdbcType="TINYINT" />
         <result column="is_authorized_pay" property="isAuthorizedPay" jdbcType="TINYINT" />
+        <result column="open_pay" property="openPay" jdbcType="TINYINT" />
     </resultMap>
 
     <insert id="insert" useGeneratedKeys="true" parameterType="bookAuthInfo">
       INSERT INTO BOOK_AUTH_INFO(
 			BOOK_ID, CHANNEL_ID,ADVISER_ID,PRICE,CODE_USE_COUNT,BUY_URL,CHECK_TYPE, CREATED_USER, CREATED_DATE,LAST_MODIFIED_DATE,OPEN_TIME,
-			is_paper_book, is_group_book, is_authorized_pay
+			is_paper_book, is_group_book, is_authorized_pay, open_pay
 		)
 	    VALUES 
        (#{bookId,jdbcType=BIGINT}, #{channelId,jdbcType=BIGINT}, #{adviserId,jdbcType=BIGINT},
 		 #{price}, #{codeUseCount,jdbcType=BIGINT}, #{buyUrl}, #{checkType},
         #{adviserId,jdbcType=BIGINT}, NOW(), NOW(), NOW(),
-        #{isPaperBook}, #{isGroupBook}, IFNULL(#{isAuthorizedPay},0))
+        #{isPaperBook}, #{isGroupBook}, IFNULL(#{isAuthorizedPay},0), IFNULL(#{openPay},1))
     </insert>
 
     <select id="getInfoByBook" resultMap="BookAuthInfoMap" parameterType="map">
         SELECT
-           ID, BOOK_ID, CHANNEL_ID,ADVISER_ID,PRICE,CODE_USE_COUNT,BUY_URL,CHECK_TYPE,BOOK_STATUS,LOCATION_DESC, is_authorized_pay
+           ID, BOOK_ID, CHANNEL_ID,ADVISER_ID,PRICE,CODE_USE_COUNT,BUY_URL,CHECK_TYPE,BOOK_STATUS,LOCATION_DESC, is_authorized_pay, open_pay
         FROM
            BOOK_AUTH_INFO
         WHERE
@@ -267,6 +268,9 @@
         <if test="isAuthorizedPay != null">
             is_authorized_pay = #{isAuthorizedPay},
         </if>
+        <if test="openPay != null">
+            open_pay = #{openPay},
+        </if>
            LAST_MODIFIED_DATE = NOW()
         WHERE
         ID = #{id}