Merge branch 'fixbug/1025593' into 'master'

bug: [1025593] 小程序里资源的顺序要和公众号里配置的一致

See merge request rays/pcloud-book!960

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

@@ -5056,6 +5056,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
         }
     }
 
+    @Override
     public List<BookServeDTO> getBookAndBookGroupServeIds( Long adviserId, Long bookId, Long channelId ) {
         List<BookServeDTO> serveDTOList = new ArrayList<>();
         BookGroupDTO bookGroupDTO = bookGroupDao.getDTOByBookId(bookId, channelId, adviserId);
@@ -5065,26 +5066,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
         if (null == accountSettingDto){
             return new ArrayList<>();
         }
-        if (null != bookGroupDTO) {//有社群书
-            //社群书配置资源
-            List<BookGroupServe> bookGroupServes = bookGroupServeDao.getListByBookGroupId(bookGroupDTO.getId());
-            if (!ListUtils.isEmpty(bookGroupServes)) {
-                for (BookGroupServe bookGroupServe : bookGroupServes) {
-                    BookServeDTO bookServeDTO = new BookServeDTO();
-                    BeanUtils.copyProperties(bookGroupServe, bookServeDTO);
-                    String url = SendWeixinRequestTools.splitUrl(accountSettingDto, bookGroupServe.getServeUrl());
-                    bookServeDTO.setUrl(url);
-                    bookServeDTO.setTypeCode(bookServeDTO.getServeType());
-                    bookServeDTO.setFromType(bookGroupServe.getTypeCode());
-                    serveDTOList.add(bookServeDTO);
-                    if (AppAndProductTypeEnum.APP.value.equals(bookServeDTO.getServeType())) {
-                        appIds.add(bookGroupServe.getServeId());
-                    } else {
-                        productIds.add(bookGroupServe.getServeId());
-                    }
-                }
-            }
-        }
+        //先排纸书二维码资源，后排社群书资源，张文庆
         //现代纸书二维码配置资源
         BookServeParamVO serveParamVO = new BookServeParamVO();
         serveParamVO.setAdviserId(adviserId);
@@ -5113,6 +5095,28 @@ public class BookGroupBizImpl implements BookGroupBiz {
                 }
             }
         }
+        if (null != bookGroupDTO) {//有社群书
+            //社群书配置资源
+            List<BookGroupServe> bookGroupServes = bookGroupServeDao.getListByBookGroupId(bookGroupDTO.getId());
+            if (!ListUtils.isEmpty(bookGroupServes)) {
+                for (BookGroupServe bookGroupServe : bookGroupServes) {
+                    BookServeDTO bookServeDTO = new BookServeDTO();
+                    BeanUtils.copyProperties(bookGroupServe, bookServeDTO);
+                    String url = SendWeixinRequestTools.splitUrl(accountSettingDto, bookGroupServe.getServeUrl());
+                    bookServeDTO.setUrl(url);
+                    bookServeDTO.setTypeCode(bookServeDTO.getServeType());
+                    bookServeDTO.setFromType(bookGroupServe.getTypeCode());
+                    Long serveId = bookGroupServe.getServeId();
+                    if (AppAndProductTypeEnum.APP.value.equals(bookServeDTO.getServeType()) && !appIds.contains(serveId)) {
+                        serveDTOList.add(bookServeDTO);
+                        appIds.add(serveId);
+                    } else if (AppAndProductTypeEnum.PRODUCT.value.equals(bookServeDTO.getServeType()) && !productIds.contains(serveId)){
+                        serveDTOList.add(bookServeDTO);
+                        productIds.add(serveId);
+                    }
+                }
+            }
+        }
         return serveDTOList;
     }