Merge branch 'feature/1006286' into 'master'

feat:[1006286]选企微码增加文案设置

See merge request rays/pcloud-book!1487

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

@@ -86,6 +86,7 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
             }
             bookQrcodeWxwork.setWxworkQrcodeId(bookQrcodeWxworkRequestVO.getWxworkQrcodeId());
             bookQrcodeWxwork.setWxworkQrcodeType(bookQrcodeWxworkRequestVO.getWxworkQrcodeType());
+            bookQrcodeWxwork.setGuide(bookQrcodeWxworkRequestVO.getGuide());
             bookQrcodeWxworkDao.insert(bookQrcodeWxwork);
         }
     }
@@ -136,11 +137,18 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
     @Override
     public BookQrcodeWxworkResponseVO getWxworkQrcodeInfoBySceneOrBookGroup(Long sceneId, Long bookGroupId, Integer wxworkQrcodeType) {
         BookQrcodeWxworkResponseVO bookQrcodeWxworkResponseVO = new BookQrcodeWxworkResponseVO();
-        Long wxworkQrcodeId = this.getWxworkQrcodeIdBySceneOrBookGroup(sceneId, bookGroupId, wxworkQrcodeType);
-        if (null == wxworkQrcodeId) {
+        BookQrcodeWxwork bookQrcodeWxwork;
+        if (null != sceneId) {
+            bookQrcodeWxwork = bookQrcodeWxworkDao.getByQrcodeIdAndType(sceneId, BookQrcodeType.OFFICIAL_ACCOUNTS.getCode(), wxworkQrcodeType);
+        } else {
+            bookQrcodeWxwork = bookQrcodeWxworkDao.getByQrcodeIdAndType(bookGroupId, BookQrcodeType.RAYS.getCode(), wxworkQrcodeType);
+        }
+        if (null == bookQrcodeWxwork) {
             return bookQrcodeWxworkResponseVO;
         }
+        Long wxworkQrcodeId = bookQrcodeWxwork.getWxworkQrcodeId();
         bookQrcodeWxworkResponseVO.setWxworkQrcodeId(wxworkQrcodeId);
+        bookQrcodeWxworkResponseVO.setGuide(bookQrcodeWxwork.getGuide());
         if (WxworkQrcodeType.SOP_QRCODE.getCode().equals(wxworkQrcodeType)) {
             WxworkQrcodeBaseDTO wxworkQrcodeBaseDTO = wechatGroupConsr.getWxworkQrcodeBaseById(wxworkQrcodeId);
             if (null != wxworkQrcodeBaseDTO) {
@@ -157,6 +165,12 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
                 bookQrcodeWxworkResponseVO.setInvitationRays(groupQrcodeBaseDTO.getInvitationRays());
                 bookQrcodeWxworkResponseVO.setInvitationAccounts(groupQrcodeBaseDTO.getInvitationAccounts());
             }
+        } else if (WxworkQrcodeType.CRM_QRCODE.getCode().equals(wxworkQrcodeType)) {
+            CrmContactQrcodeVO crmContactQrcodeVO = erpConsr.getContactQrcodeNameById4Adviser(wxworkQrcodeId);
+            if (null != crmContactQrcodeVO) {
+                bookQrcodeWxworkResponseVO.setWxworkQrcodeUrl(crmContactQrcodeVO.getQrcodeUrl());
+                bookQrcodeWxworkResponseVO.setWxworkQrcodeName(crmContactQrcodeVO.getContactQrcodeName());
+            }
         }
         return bookQrcodeWxworkResponseVO;
     }
@@ -313,6 +327,7 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
                 if (null != crmContactQrcodeVO) {
                     dto.setWxworkQrcodeUrl(crmContactQrcodeVO.getQrcodeUrl());
                     dto.setWxworkQrcodeName(crmContactQrcodeVO.getContactQrcodeName());
+                    dto.setGuide(wxwork.getGuide());
                 }
             }
             wxworkQrcodeDTOS.add(dto);

pcloud-service-book/src/main/java/com/pcloud/book/book/entity/BookQrcodeWxwork.java

 package com.pcloud.book.book.entity;
 
 import com.pcloud.common.entity.BaseEntity;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -45,4 +47,7 @@ public class BookQrcodeWxwork extends BaseEntity {
      */
     private Integer wxworkQrcodeType;
 
+    @ApiModelProperty("引导语")
+    private String guide;
+
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/book/vo/request/BookQrcodeWxworkRequestVO.java

@@ -21,4 +21,7 @@ public class BookQrcodeWxworkRequestVO {
     private Long wxworkQrcodeId;
     @ApiModelProperty("企业微信二维码类型（1sop活码2群活码）")
     private Integer wxworkQrcodeType;
+
+    @ApiModelProperty("引导语")
+    private String guide;
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/book/vo/response/BookQrcodeWxworkResponseVO.java

@@ -74,4 +74,6 @@ public class BookQrcodeWxworkResponseVO extends BaseDto {
      * 群分类
      */
     private String classifyName;
+    @ApiModelProperty("引导语")
+    private String guide;
 }

pcloud-service-book/src/main/resources/mapper/book/BookQrcodeWxworkDao.xml

@@ -12,10 +12,11 @@
         <result property="wxworkQrcodeId" column="wxwork_qrcode_id" jdbcType="INTEGER"/>
         <result property="wxworkQrcodeType" column="wxwork_qrcode_type" jdbcType="INTEGER"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="guide" column="guide" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-       id, book_id, channel_id, adviser_id, book_qrcode_type, book_qrcode_id, wxwork_qrcode_id, wxwork_qrcode_type, create_time
+       id, book_id, channel_id, adviser_id, book_qrcode_type, book_qrcode_id, wxwork_qrcode_id, wxwork_qrcode_type, create_time, guide
     </sql>
     <!--查询单个-->
     <select id="getById" resultMap="BookQrcodeWxworkMap">
@@ -28,9 +29,9 @@
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into book.book_qrcode_wxwork(book_id, channel_id, adviser_id, book_qrcode_type, book_qrcode_id, wxwork_qrcode_id,
-         wxwork_qrcode_type, create_time)
+         wxwork_qrcode_type, create_time, guide)
         values (#{bookId}, #{channelId}, #{adviserId}, #{bookQrcodeType}, #{bookQrcodeId}, #{wxworkQrcodeId},
-         #{wxworkQrcodeType}, now())
+         #{wxworkQrcodeType}, now(), #{guide})
     </insert>
 
     <!--通过主键修改数据-->