feat:商品信息

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/vo/ResourceRelationVO.java

@@ -55,8 +55,10 @@ public class ResourceRelationVO {
     private Date publishTime;
     @ApiModelProperty("出版单位")
     private String publisher;
-    @ApiModelProperty("简介")
-    private String synopsis;
+    @ApiModelProperty("专题id，新增时不需要填写")
+    private String projectId;
+    @ApiModelProperty("专题名称")
+    private String projectName;
     //查看全部资源需要
     @ApiModelProperty(value = "资源包下关联的资源")
     private List<ResourceRelationVO> resourceList;

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/service/impl/GoodsLibraryServiceImpl.java

@@ -10,6 +10,7 @@ import com.google.common.base.Preconditions;
 import com.zrqx.base.token.TokenManager;
 import com.zrqx.core.enums.AllResourceTypeEnum;
 import com.zrqx.core.enums.ErrorCodeEnum;
+import com.zrqx.core.enums.GoodsTypeEnum;
 import com.zrqx.core.enums.LibraryStatusEnum;
 import com.zrqx.core.page.PageInfo;
 import com.zrqx.core.page.PageParam;
@@ -58,6 +59,7 @@ import com.zrqx.resource.model.po.goodslibrary.GoodsLibraryDiyTypePO;
 import com.zrqx.resource.model.po.goodslibrary.GoodsLibraryLabelContentDiyTypePO;
 import com.zrqx.resource.model.po.goodslibrary.GoodsLibrary;
 import com.zrqx.resource.model.po.membercollection.MemberCollection;
+import com.zrqx.resource.model.po.projectlibrary.ProjectLibrary;
 import com.zrqx.resource.model.po.qrcode.QrCode;
 import com.zrqx.resource.model.po.record.Record;
 import com.zrqx.resource.model.po.resourcerelation.RelationAuthor;
@@ -68,6 +70,7 @@ import com.zrqx.resource.model.vo.audiolibrary.AudioEchartsDataNumberVO;
 import com.zrqx.resource.model.vo.courselibrary.*;
 import com.zrqx.resource.model.vo.goodslibrary.GoodsLibraryListVO;
 import com.zrqx.resource.model.vo.goodslibrary.GoodsLibraryVO;
+import com.zrqx.resource.model.vo.projectlibrary.ProjectResourceVO;
 import com.zrqx.resource.model.vo.videolibrary.VideoEchartsDataNumberVO;
 import com.zrqx.resource.model.vo.videolibrary.VideoLibraryListVO;
 import com.zrqx.resource.service.*;

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/service/impl/ResourceRelationServiceImpl.java

@@ -8,6 +8,7 @@ import com.github.pagehelper.PageHelper;
 import com.zrqx.base.token.TokenManager;
 import com.zrqx.core.enums.AllResourceTypeEnum;
 import com.zrqx.core.enums.EbookStatusEnum;
+import com.zrqx.core.enums.GoodsTypeEnum;
 import com.zrqx.core.enums.LibraryStatusEnum;
 import com.zrqx.core.page.PageInfo;
 import com.zrqx.core.page.PageParam;
@@ -30,6 +31,7 @@ import com.zrqx.resource.mapper.pdffilelibrary.PdfLibraryMapper;
 import com.zrqx.resource.mapper.phybook.PhysicalBookDetailsMapper;
 import com.zrqx.resource.mapper.phybook.PhysicalBookMapper;
 import com.zrqx.resource.mapper.projectlibrary.ProjectLibraryMapper;
+import com.zrqx.resource.mapper.projectlibrary.ProjectModelResourceMapper;
 import com.zrqx.resource.mapper.videolibrary.VideoLibraryMapper;
 import com.zrqx.resource.model.form.QueryResourceForPoPForm;
 import com.zrqx.resource.model.form.QueryResourceRelationForm;
@@ -57,6 +59,7 @@ import com.zrqx.resource.model.vo.bulletin.BulletinListVO;
 import com.zrqx.resource.model.vo.courselibrary.CourseResourceVO;
 import com.zrqx.resource.model.vo.ebook.EbookListVO;
 import com.zrqx.resource.model.vo.live.LiveVO;
+import com.zrqx.resource.model.vo.projectlibrary.ProjectResourceVO;
 import com.zrqx.resource.service.ResourceRelationService;
 import com.zrqx.util.PublicUtil;
 import com.zrqx.util.datatype.ArrayUtils;
@@ -107,7 +110,8 @@ public class ResourceRelationServiceImpl extends ServiceImpl<ResourceRelationMap
     private SystemAdminClient systemAdminClient;
     @Resource
     private TokenManager tokenManager;
-
+    @Resource
+    private ProjectModelResourceMapper projectModelResourceMapper;
 
     @Override
     public boolean deleteByResourceIds(List<String> ids, String type) {
@@ -138,6 +142,15 @@ public class ResourceRelationServiceImpl extends ServiceImpl<ResourceRelationMap
                         e.setPublisher(vl.getPublisher());
                         e.setPublishTime(vl.getPublishTime());
                         e.setSynopsis(eb.getSynopsis());
+                        //获取系列
+                        List<ProjectResourceVO> list1 = projectModelResourceMapper.getResourceRelationProject(e.getResourceId(), GoodsTypeEnum.EBOOK.getCode());
+                        if(list1.size()>0){
+                            ProjectLibrary sc = projectLibraryMapper.selectById(list1.get(0).getProjectId());
+                            if (sc != null) {
+                                e.setProjectName(sc.getName());
+                                e.setProjectId(sc.getId());
+                            }
+                        }
                     }
                 }
                 if (e.getResourceType().equals(AllResourceTypeEnum.BOOK.getCode())) {