Merge branch 'feature/1004128' into 'master'

feat: [1004128] 编辑端企业微信群勾选

See merge request rays/pcloud-book!1166

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

@@ -44,5 +44,5 @@ public interface BookQrcodeWxworkBiz {
      * @date：2020/12/23 16:41
      *  * @param null
      */
-    List<BookQrcodeWxworkResponseVO> getWxworkQrcodeInfoByBook4Rays(Long bookId, Long channelId, Long adviserId);
+    List<BookQrcodeWxworkResponseVO> getWxworkQrcodeInfoByBook4Rays(Long bookId, Long channelId, Long adviserId, Integer wxworkQrcodeType);
 }

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

 package com.pcloud.book.book.biz.impl;
 
+import com.pcloud.book.applet.biz.AppletGroupSearchRecordBiz;
+import com.pcloud.book.applet.dto.AppletGroupStatementDTO;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.book.biz.BookQrcodeWxworkBiz;
 import com.pcloud.book.book.dao.BookQrcodeWxworkDao;
@@ -46,6 +48,8 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
     private BookGroupDao bookGroupDao;
     @Autowired
     private WechatGroupConsr wechatGroupConsr;
+    @Autowired
+    private AppletGroupSearchRecordBiz appletGroupSearchRecordBiz;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -151,9 +155,9 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
     }
 
     @Override
-    public List<BookQrcodeWxworkResponseVO> getWxworkQrcodeInfoByBook4Rays(Long bookId, Long channelId, Long adviserId) {
+    public List<BookQrcodeWxworkResponseVO> getWxworkQrcodeInfoByBook4Rays(Long bookId, Long channelId, Long adviserId, Integer wxworkQrcodeType) {
         List<BookQrcodeWxworkResponseVO> wxworkResponseVOS = new ArrayList<>();
-        List<BookQrcodeWxwork> wxworkList = bookQrcodeWxworkDao.getWxworkQrcodeByBook(bookId, channelId, adviserId, null);
+        List<BookQrcodeWxwork> wxworkList = bookQrcodeWxworkDao.getWxworkQrcodeByBook(bookId, channelId, adviserId, wxworkQrcodeType);
         if (ListUtils.isEmpty(wxworkList)) {
             return new ArrayList<>();
         }
@@ -197,6 +201,13 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
                     responseVO.setWxworkQrcodeName(wxworkGroupQrcodeBaseDTO.getGroupQrcodeName());
                     responseVO.setInvitationAccounts(wxworkGroupQrcodeBaseDTO.getInvitationAccounts());
                     responseVO.setInvitationRays(wxworkGroupQrcodeBaseDTO.getInvitationRays());
+                    //头像列表从缓存里取
+                    List<String> headUrlList = appletGroupSearchRecordBiz
+                            .getHeadUrlList(9, bookQrcodeWxwork.getWxworkQrcodeId());
+                    responseVO.setHeadUrlList(headUrlList);
+                    List<AppletGroupStatementDTO> statementDTOList = appletGroupSearchRecordBiz
+                            .getStatementList(9, headUrlList, bookQrcodeWxwork.getWxworkQrcodeId());
+                    responseVO.setStatementDTOList(statementDTOList);
                     wxworkResponseVOS.add(responseVO);
                 }
             }

pcloud-service-book/src/main/java/com/pcloud/book/book/dao/BookQrcodeWxworkDao.java

@@ -36,5 +36,5 @@ public interface BookQrcodeWxworkDao extends BaseDao<BookQrcodeWxwork>{
      * @date：2020/12/23 16:43
      *  * @param null
      */
-    List<BookQrcodeWxwork> getWxworkQrcodeByBook(Long bookId, Long channelId, Long adviserId, Integer bookQrcodeType);
+    List<BookQrcodeWxwork> getWxworkQrcodeByBook(Long bookId, Long channelId, Long adviserId, Integer wxworkQrcodeType);
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/book/dao/impl/BookQrcodeWxworkDaoImpl.java

@@ -39,12 +39,12 @@ public class BookQrcodeWxworkDaoImpl extends BaseDaoImpl<BookQrcodeWxwork> imple
     }
 
     @Override
-    public List<BookQrcodeWxwork> getWxworkQrcodeByBook(Long bookId, Long channelId, Long adviserId, Integer bookQrcodeType) {
+    public List<BookQrcodeWxwork> getWxworkQrcodeByBook(Long bookId, Long channelId, Long adviserId, Integer wxworkQrcodeType) {
         Map<String, Object> map = new HashMap<>();
         map.put("bookId", bookId);
         map.put("channelId", channelId);
         map.put("adviserId", adviserId);
-        map.put("bookQrcodeType", bookQrcodeType);
+        map.put("wxworkQrcodeType", wxworkQrcodeType);
         return getSessionTemplate().selectList(getStatement("getWxworkQrcodeByBook"), map);
     }
 }

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

@@ -52,7 +52,8 @@ public class BookWxworkFacade {
     @ApiOperation("根据书刊查RAYS码配置的企业微信")
     @GetMapping("getWxworkQrcodeInfoByBook4Rays")
     public ResponseDto<?> getWxworkQrcodeInfoByBook4Rays(
-            @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId, @RequestParam("adviserId") Long adviserId) {
-        return new ResponseDto<>(bookQrcodeWxworkBiz.getWxworkQrcodeInfoByBook4Rays(bookId, channelId, adviserId));
+            @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId, @RequestParam("adviserId") Long adviserId,
+            @RequestParam(value = "wxworkQrcodeType", required = false) Integer wxworkQrcodeType) {
+        return new ResponseDto<>(bookQrcodeWxworkBiz.getWxworkQrcodeInfoByBook4Rays(bookId, channelId, adviserId, wxworkQrcodeType));
     }
 }

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

 package com.pcloud.book.book.vo.response;
 
+import com.pcloud.book.applet.dto.AppletGroupStatementDTO;
 import com.pcloud.common.dto.BaseDto;
 
+import java.util.List;
+
 import lombok.Data;
 
 /**
@@ -47,4 +50,12 @@ public class BookQrcodeWxworkResponseVO extends BaseDto {
      * 公众号邀请语
      */
     private String invitationAccounts;
+    /**
+     * 群头像
+     */
+    private List<String> headUrlList;
+    /**
+     * 群对话
+     */
+    private  List<AppletGroupStatementDTO> statementDTOList;
 }

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

@@ -89,8 +89,8 @@
         where book_id = #{bookId}
         and channel_id = #{channelId}
         and adviser_id = #{adviserId}
-        <if test="bookQrcodeType != null">
-            and book_qrcode_type = #{bookQrcodeType}
+        <if test="wxworkQrcodeType != null">
+            and wxwork_qrcode_type = #{wxworkQrcodeType}
         </if>
         order by wxwork_qrcode_type asc, create_time desc
     </select>