Merge branch 'fix-dw'

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

@@ -306,6 +306,8 @@ public class BookGroupBizImpl implements BookGroupBiz {
                 group.setSceneId(groupQrcodeVO.getSceneId());
                 group.setGroupQrcodeUrl(groupQrcodeVO.getQrcodeUrl());
                 bookGroupDao.update(group);
+                // 展示返回最新生成的
+                bookGroupDTO.setGroupQrcodeUrl(groupQrcodeVO.getQrcodeUrl());
             }
             // 更新为自建码
             if (addType != null && addType == 2) {
@@ -317,6 +319,8 @@ public class BookGroupBizImpl implements BookGroupBiz {
                     if (!haveQrcode) {
                         String groupQrcodeUrl = QrcodeUtils.createWithMargin(bookGroupQrcodeDomain + "/" + bookGroupDTO.getId(), 1);
                         group.setGroupQrcodeUrl(groupQrcodeUrl);
+                        // 展示返回最新生成的
+                        bookGroupDTO.setGroupQrcodeUrl(groupQrcodeUrl);
                     }
                     bookGroupDao.update(group);
                 }

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

@@ -169,20 +169,16 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
             }
             bookKeyword.setIsEdit(1);
             bookKeywordDao.insert(bookKeyword);
-        }
+        } else {
             //按书创建
-        else {
             List<ClassifyNameVO> classifyNameVOS = bookGroupClassifyDao.listClassifyByRank(setKeywordVO.getBookGroupId());
             List<BookKeyword> bookKeywords = new ArrayList<>();
-            //创建群的记录
-            if (!ListUtils.isEmpty(classifyNameVOS)) {
-                classifyNameVOS.forEach(e -> {
+            //创建书的记录
             BookKeyword bookKeyword = new BookKeyword();
             BeanUtils.copyProperties(setKeywordVO, bookKeyword);
             bookKeyword.setKeywordId(keyword.getId());
             bookKeyword.setBookId(bookGroupDTO.getBookId());
             bookKeyword.setChannelId(bookGroupDTO.getChannelId());
-                    bookKeyword.setClassifyId(e.getId());
             //获取最大排序值
             Integer rank = bookKeywordDao.getMaxRank(setKeywordVO.getBookGroupId(), bookKeyword.getClassifyId());
             bookKeyword.setRank(rank + 1);
@@ -193,36 +189,40 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
                 bookKeyword.setWarehouseId(warehouseId);
                 bookKeyword.setIsWarehouse(1);
             }
-                    if (null == bookKeyword.getIsWarehouse()) {
-                        bookKeyword.setIsWarehouse(0);
+            //创建群的记录
+            if (!ListUtils.isEmpty(classifyNameVOS)) {
+                classifyNameVOS.forEach(e -> {
+                    BookKeyword cKeyword = new BookKeyword();
+                    BeanUtils.copyProperties(setKeywordVO, cKeyword);
+                    cKeyword.setKeywordId(keyword.getId());
+                    cKeyword.setBookId(bookGroupDTO.getBookId());
+                    cKeyword.setChannelId(bookGroupDTO.getChannelId());
+                    cKeyword.setClassifyId(e.getId());
+                    //获取最大排序值
+                    Integer rank1 = bookKeywordDao.getMaxRank(setKeywordVO.getBookGroupId(), cKeyword.getClassifyId());
+                    cKeyword.setRank(rank1 + 1);
+                    cKeyword.setCreateUser(setKeywordVO.getUserId());
+                    if (null != setKeywordVO.getAddWarehouse() && 1 == setKeywordVO.getAddWarehouse()) {
+                        // 书入库一遍，同样的就不要入库了
+//                        setKeywordVO.setChannelId(bookGroupDTO.getChannelId());
+//                        final Long warehouseId = bookKeywordWarehouseBiz.addBookKeyword(setKeywordVO);
+                    cKeyword.setWarehouseId(bookKeyword.getWarehouseId());
+                    cKeyword.setIsWarehouse(1);
                     }
-                    if (null == bookKeyword.getWarehouseId()) {
-                        bookKeyword.setWarehouseId(0L);
+                    if (null == cKeyword.getIsWarehouse()) {
+                        cKeyword.setIsWarehouse(0);
                     }
-                    if (0 == bookKeyword.getClassifyId()) {
-                        bookKeyword.setIsEdit(1);
+                    if (null == cKeyword.getWarehouseId()) {
+                        cKeyword.setWarehouseId(0L);
+                    }
+                    if (0 == cKeyword.getClassifyId()) {
+                        cKeyword.setIsEdit(1);
                     }else {
-                        bookKeyword.setIsEdit(0);
+                        cKeyword.setIsEdit(0);
                     }
-                    bookKeywords.add(bookKeyword);
+                    bookKeywords.add(cKeyword);
                 });
             }
-            //创建书的记录
-            BookKeyword bookKeyword = new BookKeyword();
-            BeanUtils.copyProperties(setKeywordVO, bookKeyword);
-            bookKeyword.setKeywordId(keyword.getId());
-            bookKeyword.setBookId(bookGroupDTO.getBookId());
-            bookKeyword.setChannelId(bookGroupDTO.getChannelId());
-            //获取最大排序值
-            Integer rank = bookKeywordDao.getMaxRank(setKeywordVO.getBookGroupId(), bookKeyword.getClassifyId());
-            bookKeyword.setRank(rank + 1);
-            bookKeyword.setCreateUser(setKeywordVO.getUserId());
-            if (null != setKeywordVO.getAddWarehouse() && 1 == setKeywordVO.getAddWarehouse()) {
-                setKeywordVO.setChannelId(bookGroupDTO.getChannelId());
-                final Long warehouseId = bookKeywordWarehouseBiz.addBookKeyword(setKeywordVO);
-                bookKeyword.setWarehouseId(warehouseId);
-                bookKeyword.setIsWarehouse(1);
-            }
             if (null == bookKeyword.getIsWarehouse()) {
                 bookKeyword.setIsWarehouse(0);
             }

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

@@ -261,6 +261,7 @@
         <if test="classifyId!=null">
             AND t.classify_id=#{classifyId}
         </if>
+        GROUP BY t.keyword_id
         order by t.create_time desc
     </select>