Merge branch 'revert-54565128' into 'release'

Revert "Merge branch 'feature/1007001' into 'release'"

See merge request rays/pcloud-book!1562

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java

@@ -859,8 +859,6 @@ public class BookDto extends BaseDto {
      */
     private Integer appointBook;
 
-    private Integer openRaysCode;
-
     public Integer getAppointBook() {
         return appointBook;
     }
@@ -2429,14 +2427,6 @@ public class BookDto extends BaseDto {
         this.erpNumbers = erpNumbers;
     }
 
-    public Integer getOpenRaysCode() {
-        return openRaysCode;
-    }
-
-    public void setOpenRaysCode(Integer openRaysCode) {
-        this.openRaysCode = openRaysCode;
-    }
-
     @Override
     public String toString() {
         return "BookDto{" +

pcloud-facade-book/src/main/java/com/pcloud/book/book/entity/BookAdviser.java

@@ -118,6 +118,4 @@ public class BookAdviser extends BaseEntity {
 	 * 上下册标签id
 	 */
 	private Long volLabelId;
-
-	private Integer openRaysCode;
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookAdviserBiz.java

@@ -507,6 +507,4 @@ public interface BookAdviserBiz {
 	Map<Long, AdviserBookStatisDto> getAdviserBookStatis(AdviserBookStatisRequestDto requestDto);
 
 	Integer getBookIsOpenCatalog(Long bookId, Long channelId, Long adviserId);
-
-	void updateOpenRaysCode(BookAdviser bookAdviser);
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java

@@ -3564,16 +3564,4 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 		Integer isOpenCatalog = bookAdviserDao.getBookIsOpenCatalog(bookId,channelId,adviserId);
 		return null == isOpenCatalog?0:isOpenCatalog;
 	}
-
-	@Override
-	public void updateOpenRaysCode(BookAdviser bookAdviser) {
-		if (bookAdviser == null || bookAdviser.getBookAdviserId() == null) {
-			throw BizException.PARAM_DELETION;
-		}
-
-		BookAdviser model = new BookAdviser();
-		model.setBookAdviserId(bookAdviser.getBookAdviserId());
-		model.setOpenRaysCode(bookAdviser.getOpenRaysCode());
-		bookAdviserDao.update(model);
-	}
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookFacade.java

@@ -180,8 +180,7 @@ public interface BookFacade {
                                               @RequestParam(value = "graLabelId", required = false) Integer graLabelId,
                                               @RequestParam(value = "subLabelId", required = false) Integer subLabelId,
                                               @RequestParam(value = "verLabelId", required = false) Integer verLabelId,
-                                              @RequestParam(value = "appointBook", required = false) Integer appointBook,
-                                              @RequestParam(value = "openRaysCode", required = false) Integer openRaysCode)
+                                              @RequestParam(value = "appointBook", required = false) Integer appointBook)
             throws BizException, PermissionException;
 
     @ApiOperation(value = "首页获取正在做的图书", httpMethod = "GET")

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookAdviserFacadeImpl.java

@@ -597,13 +597,4 @@ public class BookAdviserFacadeImpl implements BookAdviserFacade {
 		return new ResponseDto<>(bookAdviserBiz.multiGetBookScanCount(param));
 	}
 
-	/**
-	 * 更新
-	 */
-	@PostMapping("updateOpenRaysCode")
-	public ResponseDto<?> updateOpenRaysCode(@RequestHeader("token") String token, @RequestBody BookAdviser bookAdviser) throws PermissionException {
-		Long adviserId = (Long)SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
-		bookAdviserBiz.updateOpenRaysCode(bookAdviser);
-		return new ResponseDto<>();
-	}
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java

@@ -288,8 +288,7 @@ public class BookFacadeImpl implements BookFacade {
                                                       @RequestParam(value = "graLabelId", required = false) Integer graLabelId,
                                                       @RequestParam(value = "subLabelId", required = false) Integer subLabelId,
                                                       @RequestParam(value = "verLabelId", required = false) Integer verLabelId,
-                                                      @RequestParam(value = "appointBook", required = false) Integer appointBook,
-                                                      @RequestParam(value = "openRaysCode", required = false) Integer openRaysCode)
+                                                      @RequestParam(value = "appointBook", required = false) Integer appointBook)
             throws BizException, PermissionException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
         if (currentPage == null || numPerPage == null || currentPage < 0 || numPerPage < 0) {
@@ -333,7 +332,6 @@ public class BookFacadeImpl implements BookFacade {
         paramMap.put("graLabelId", graLabelId);
         paramMap.put("subLabelId", subLabelId);
         paramMap.put("verLabelId", verLabelId);
-        paramMap.put("openRaysCode", openRaysCode);
         PageBean pageBean = bookBiz.getListPage4Adviser(paramMap, new PageParam(currentPage, numPerPage), adviserId, hasQrcode,appointBook);
         return new ResponseDto<>(pageBean);
     }

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.pcloud.book.book.dao.impl.BookDaoImpl">
 
 	<!-- 书籍实体DTO -->
-	<resultMap id="bookMap" type="com.pcloud.book.book.dto.BookDto">
+	<resultMap id="bookMap" type="bookDto">
 		<id column="BOOK_ID" property="bookId" jdbcType="BIGINT" />
 		<result column="TYPE_CODE" property="typeCode" jdbcType="VARCHAR" />
 		<result column="TYPE_NAME" property="typeName" jdbcType="VARCHAR" />
@@ -78,7 +78,6 @@
 		<result column="book_phone_auth" property="bookPhoneAuth" jdbcType="BIT" />
 		<result column="is_wechat_auth" property="isWechatAuth" jdbcType="BIT" />
 		<result column="is_jump_book" property="isJumpBook" jdbcType="TINYINT" />
-		<result column="open_rays_code" property="openRaysCode" jdbcType="INTEGER" />
 	</resultMap>
 	
 	<resultMap id="bookListPageMap" type="bookDto" extends ="bookMap">
@@ -323,7 +322,7 @@
 			BA.GRA_LABEL_ID,BA.SUB_LABEL_ID,BA.VER_LABEL_ID,BA.AREA_LABEL_ID, BA.IS_PRINT isPrint, BA.is_relate,
 			BA.pro_label_id, BA.dep_label_id,BA.pur_label_id,BA.vol_label_id,if(G.ID IS NULL, 0, 1) isBookGroup, G.id BOOK_GROUP_ID,G.join_group_type,
 			BA.is_open_robot_process,BA.vol_label_id,b.unique_number,BA.CREATED_DATE,b.edition,BA.is_send_mini_url,
-			BA.is_open_catalog ,BA.is_approval, BA.book_phone_auth,BA.is_wechat_auth,BA.is_jump_book,BA.open_rays_code
+			BA.is_open_catalog ,BA.is_approval, BA.book_phone_auth,BA.is_wechat_auth,BA.is_jump_book
 		FROM
 			BOOK_ADVISER BA	
 		INNER JOIN 
@@ -661,9 +660,6 @@
 		<if test="verLabelId != null">
 			AND A.ver_label_id = #{verLabelId}
 		</if>
-		<if test="openRaysCode != null and openRaysCode == 1">
-			AND A.open_rays_code = 1
-		</if>
 		GROUP BY A.BOOK_ID, A.CHANNEL_ID
 		ORDER BY
 			LAST_MODIFIED_DATE DESC
@@ -1521,10 +1517,9 @@
 	<!-- 书刊列表-出版端 -->
 	<select id="listPage4Agent" parameterType="map" resultMap="bookMap">
 		SELECT
-			A.BOOK_ADVISER_ID, A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK,
+			A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK,
 			B.AUTHOR, B.PUBLISH, B.PUBLISH_DATE, B.COVER_IMG, B.ORIGIN_NAME, B.BOOK_PRICE, B.ISSN, B.BOOK_NUM, B.SERIAL_NUMBER,
 			IF(ISNULL(BF.BOOK_FUND_ID),0,1) IS_FUND_SUPPORT, A.TEMPLET_ID, A.IS_PRINT isPrint, IF(ISNULL(s.id),0,1) minimumSupport,B.CREATED_DATE
-			,A.open_rays_code
 		FROM
 			BOOK_ADVISER A
 		INNER JOIN

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

@@ -1420,16 +1420,4 @@
 			ADVISER_ID = #{adviserId}
 	</select>
 
-	<!-- 更新 -->
-	<update id="update" parameterType="bookAdviser">
-		UPDATE book_adviser
-		SET
-		<if test="openRaysCode != null">
-			open_rays_code = #{openRaysCode},
-		</if>
-		LAST_MODIFIED_DATE = NOW()
-		WHERE
-		book_adviser_id = #{bookAdviserId}
-	</update>
-
 </mapper>