Merge branch 'feat-1001733' of http://begitlab.chubanyun.me/rays/pcloud-book into feat-1001733

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

@@ -24,14 +24,6 @@ import com.pcloud.book.consumer.user.AdviserConsr;
 import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
 import com.pcloud.book.group.biz.BookGroupBiz;
 import com.pcloud.book.group.biz.BookGroupClassifyBiz;
-import com.pcloud.book.group.entity.BookGroup;
-import com.pcloud.book.group.entity.GroupQrcode;
-import com.pcloud.book.group.entity.JoinGroupCipher;
-import com.pcloud.book.group.entity.TempletRelevance;
-import com.pcloud.book.group.enums.CipherTypeEnum;
-import com.pcloud.book.group.enums.JoinGroupTypeEnum;
-import com.pcloud.book.group.enums.LargTempletEnum;
-import com.pcloud.book.group.vo.StatisticVO;
 import com.pcloud.book.group.biz.GroupQrcodeBiz;
 import com.pcloud.book.group.dao.AppClickRecordDao;
 import com.pcloud.book.group.dao.AppTouchRecordDao;
@@ -61,7 +53,14 @@ import com.pcloud.book.group.dto.PersonalQrcodeDTO;
 import com.pcloud.book.group.dto.QrcodeNameAndProIdDTO;
 import com.pcloud.book.group.dto.ResourceBrowseParamDto;
 import com.pcloud.book.group.dto.StatisticsIncomeDto;
+import com.pcloud.book.group.entity.BookGroup;
 import com.pcloud.book.group.entity.BookGroupServe;
+import com.pcloud.book.group.entity.GroupQrcode;
+import com.pcloud.book.group.entity.JoinGroupCipher;
+import com.pcloud.book.group.entity.TempletRelevance;
+import com.pcloud.book.group.enums.CipherTypeEnum;
+import com.pcloud.book.group.enums.JoinGroupTypeEnum;
+import com.pcloud.book.group.enums.LargTempletEnum;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
 import com.pcloud.book.group.vo.ClassifyAndGroupCountVO;
 import com.pcloud.book.group.vo.ClassifyQrcodeVO;
@@ -74,6 +73,7 @@ import com.pcloud.book.group.vo.ListBook4ChannelVO;
 import com.pcloud.book.group.vo.ListBookGroup4ChannelParamVO;
 import com.pcloud.book.group.vo.ResourceClickVO;
 import com.pcloud.book.group.vo.ResourcesStatisticVO;
+import com.pcloud.book.group.vo.StatisticVO;
 import com.pcloud.book.group.vo.TotalRescourceDataVO;
 import com.pcloud.book.group.vo.WxGroupStatisticVO;
 import com.pcloud.book.keywords.dao.BookKeywordDao;
@@ -1088,7 +1088,10 @@ public class BookGroupBizImpl implements BookGroupBiz {
                 for (BookDto bookDto : bookDtos) {
                     String bookName = null != bookDto.getBookName() ? StringUtil.addBracket(bookDto.getBookName()) : null;
                     String groupQrcodeName = bookDto.getGroupQrcodeName();
-                    String qrcodeUrl = bookDto.getGroupQrcodeUrl() == null ? null : bookDto.getGroupQrcodeUrl().replace("oss.5rs.me", "file.5rs.me");
+                    if (StringUtil.isEmpty(bookDto.getGroupQrcodeUrl())) {
+                        continue;
+                    }
+                    String qrcodeUrl = bookDto.getGroupQrcodeUrl().replace("oss.5rs.me", "file.5rs.me");
                     String qrcodeName;
                     if (!StringUtil.isEmpty(bookName)) {
                         qrcodeName = bookName;
@@ -1115,7 +1118,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
                 zipUrl = zipUrlInfo != null ? zipUrlInfo.getUrl() : null;
 
             } catch (Exception e) {
-                LOGGER.error("生成导出文件失败", e);
+                LOGGER.error("生成导出文件失败" + e.getMessage(), e);
                 isSuccess = false;
             }
             // 发送消息