Merge branch 'master' of http://begitlab.chubanyun.me/rays/pcloud-book

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

@@ -304,7 +304,9 @@ public class PushBizImpl implements PushBiz {
                     if (productDto != null) {
                         SendArticleMessageVO sendArticleMessageVO = new SendArticleMessageVO();
                         sendArticleMessageVO.setAltId(altId);
-                        sendArticleMessageVO.setDescription(productDto.getProductTypeName());
+                        if (productDto.getProductTypeDto() != null) {
+                            sendArticleMessageVO.setDescription(productDto.getProductTypeDto().getTypeName());
+                        }
                         sendArticleMessageVO.setGroupId(groupId);
                         // 处理链接地址
                         String endUrl = pushItem.getProductUrl() + "&" + otherUrl;
@@ -617,7 +619,9 @@ public class PushBizImpl implements PushBiz {
                         ProductDto productDto = productDtoMap.get(pushItem.getProductId());
                         if (productDto != null) {
                             pushItem.setApName(productDto.getProductName());
-                            pushItem.setApTypeName(productDto.getProductTypeName());
+                            if (productDto.getProductTypeDto() != null) {
+                                pushItem.setApTypeName(productDto.getProductTypeDto().getTypeName());
+                            }
                             pushItem.setApImage(productDto.getCoverImg());
                         }
                     }