[1007001] 【优化】编辑运营需求（RAYS码开关）-创建书刊

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

@@ -859,6 +859,8 @@ public class BookDto extends BaseDto {
      */
     private Integer appointBook;
 
+    private Integer openRaysCode;
+
     public Integer getAppointBook() {
         return appointBook;
     }
@@ -2427,6 +2429,14 @@ 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,4 +118,6 @@ 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,4 +507,6 @@ 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,4 +3564,16 @@ 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/biz/impl/BookBizImpl.java

@@ -1975,6 +1975,7 @@ public class BookBizImpl implements BookBiz {
         bookAdviser.setPurLabelId(book.getPurLabelId());
         bookAdviser.setVolLabelId(book.getVolLabelId());
         bookAdviser.setIpAddress(book.getIpAddress());
+        bookAdviser.setOpenRaysCode(qrcodeSceneConsr.getByAgentId(book.getAgentId()));
         if(book.getIsBookGroup()!=null&&book.getIsBookGroup()){
             bookAdviser.setIsOpenRobotProcess(1);
         }else{

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

@@ -180,7 +180,8 @@ 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 = "appointBook", required = false) Integer appointBook,
+                                              @RequestParam(value = "openRaysCode", required = false) Integer openRaysCode)
             throws BizException, PermissionException;
 
     @ApiOperation(value = "首页获取正在做的图书", httpMethod = "GET")

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

@@ -597,4 +597,13 @@ 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,7 +288,8 @@ 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 = "appointBook", required = false) Integer appointBook,
+                                                      @RequestParam(value = "openRaysCode", required = false) Integer openRaysCode)
             throws BizException, PermissionException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
         if (currentPage == null || numPerPage == null || currentPage < 0 || numPerPage < 0) {
@@ -332,6 +333,7 @@ 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/java/com/pcloud/book/consumer/channel/QrcodeSceneConsr.java

@@ -19,6 +19,7 @@ import com.pcloud.channelcenter.qrcode.entity.QrcodeTemp;
 import com.pcloud.channelcenter.qrcode.service.QrcodeLocationAssocService;
 import com.pcloud.channelcenter.qrcode.service.QrcodeSceneService;
 import com.pcloud.channelcenter.qrcode.service.QrcodeTempService;
+import com.pcloud.channelcenter.qrcode.service.RaysCodePermissionService;
 import com.pcloud.channelcenter.qrcode.vo.BookAssocLastQrAskVO;
 import com.pcloud.channelcenter.qrcode.vo.BookAssocLastQrVO;
 import com.pcloud.channelcenter.qrcode.vo.BookAssocQRcountRequestVO;
@@ -43,6 +44,7 @@ import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.channelcenter.wechat.entity.SpecialUser;
 
+import com.pcloud.readercenter.common.enums.YesOrNoNumEnum;
 import org.apache.regexp.RE;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -81,6 +83,8 @@ public class QrcodeSceneConsr {
 	private QrcodeTempService qrcodeTempService;
 	@Autowired
 	private BookQrCatalogService bookQrCatalogService;
+	@Autowired
+	private RaysCodePermissionService raysCodePermissionService;
 
 
 	/**
@@ -734,4 +738,16 @@ public class QrcodeSceneConsr {
 		}
 		return null;
 	}
+
+	@ParamLog(description = "获取是否有权限创建")
+	public Integer getByAgentId(Long agentId) throws BizException {
+		if(agentId == null) return YesOrNoNumEnum.YES.getValue();
+		try {
+			return ResponseHandleUtil.parseResponse(raysCodePermissionService.getByAgentId(agentId), Integer.class);
+		} catch (BizException e) {
+			LOGGER.error("【二维码-渠道(消)】 获取是否有权限创建失败,<ERROR>.[getByAgentId]:" + e.getMessage(),
+					e);
+		}
+		return null;
+	}
 }

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="bookDto">
+	<resultMap id="bookMap" type="com.pcloud.book.book.dto.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,6 +78,7 @@
 		<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">
@@ -322,7 +323,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.is_open_catalog ,BA.is_approval, BA.book_phone_auth,BA.is_wechat_auth,BA.is_jump_book,BA.open_rays_code
 		FROM
 			BOOK_ADVISER BA	
 		INNER JOIN 
@@ -660,6 +661,9 @@
 		<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
@@ -1517,9 +1521,10 @@
 	<!-- 书刊列表-出版端 -->
 	<select id="listPage4Agent" parameterType="map" resultMap="bookMap">
 		SELECT
-			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_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,
 			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

@@ -48,7 +48,7 @@
 		INSERT INTO BOOK_ADVISER (
 			BOOK_ID, ADVISER_ID, CHANNEL_ID, CREATED_USER, CREATED_DATE,IS_MAIN_EDITOR, TEMPLET_ID, SECOND_TEMPLET_ID,third_templet_id,
 			GRA_LABEL_ID,SUB_LABEL_ID,VER_LABEL_ID,AREA_LABEL_ID,pro_label_id, dep_label_id,pur_label_id,is_open_robot_process,
-		vol_label_id,LAST_MODIFIED_DATE,ip_address
+		vol_label_id,LAST_MODIFIED_DATE,ip_address,open_rays_code
 		)
 		VALUES (
 			#{bookId, jdbcType=VARCHAR}, #{adviserId, jdbcType=VARCHAR}, #{channelId, jdbcType=VARCHAR}, 
@@ -56,7 +56,7 @@
 			#{secondTempletId, jdbcType=BIGINT},#{thirdTempletId},#{graLabelId, jdbcType=BIGINT},#{subLabelId, jdbcType=BIGINT},
 			#{verLabelId, jdbcType=BIGINT},#{areaLabelId, jdbcType=BIGINT},#{proLabelId,jdbcType=BIGINT},
 			#{depLabelId,jdbcType=BIGINT},#{purLabelId,jdbcType=BIGINT},#{isOpenRobotProcess,jdbcType=BIT},
-		#{volLabelId},now(),#{ipAddress}
+		#{volLabelId},now(),#{ipAddress},IFNULL(#{openRaysCode},1)
 		)
 		ON
 			DUPLICATE KEY UPDATE IS_DELETE = 0,LAST_MODIFIED_DATE=now(), IS_MAIN_EDITOR = #{isMainEditor, jdbcType=BIT}
@@ -1420,4 +1420,16 @@
 			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>