--no commit message

app/resource/src/main/java/com/zrqx/resource/bg/controller/audiolibrary/AudioLibraryController.java

@@ -224,6 +224,9 @@ public class AudioLibraryController {
 		AudioLibrary entity = service.selectByPrimaryKey(oid);
 		AudioLibraryOneVO vo = new AudioLibraryOneVO();
 		BeanUtils.copyProperties(entity,vo);
+		if(StringUtils.isEmpty(vo.getRealPrice())) {
+			vo.setRealPrice("0.00");
+		}
 		if(StringUtils.isNotBlank(entity.getAuthorId())){
 			vo.setAuthorNameAndId(entity.getAuthor() + "," + entity.getAuthorId());
 		}else{

app/resource/src/main/java/com/zrqx/resource/bg/controller/videolibrary/VideoLibraryController.java

@@ -222,6 +222,9 @@ public class VideoLibraryController {
 		VideoLibrary entity = service.selectByPrimaryKey(oid);
 		VideoLibraryOneVO vo = new VideoLibraryOneVO();
 		BeanUtils.copyProperties(entity,vo);
+		if(StringUtils.isEmpty(vo.getRealPrice())) {
+			vo.setRealPrice("0.00");
+		}
 		if(StringUtils.isNotBlank(entity.getAuthorId())){
 			vo.setAuthorNameAndId(entity.getAuthor() + "," + entity.getAuthorId());
 		}else{

app/resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioLibrarySerivceImpl.java

@@ -227,6 +227,11 @@ public class AudioLibrarySerivceImpl extends BaseServiceImpl<AudioLibrary,String
 		//暂不用自定义分类id 做in查询
 		form.setDiyTypeId(null);
 		List<AudioLibraryListVO> list = mapper.query(form);
+		list.forEach(vo ->{
+			if(StringUtils.isEmpty(vo.getRealPrice())) {
+				vo.setRealPrice("0.00");
+			}
+		});
 		return new PageInfo<AudioLibraryListVO>(list);
 	}
 	@Override

app/resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibrarySerivceImpl.java

@@ -262,6 +262,11 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 		//暂不用自定义分类id 做in查询
 		form.setDiyTypeId(null);
 		List<VideoLibraryListVO> list = mapper.query(form);
+		list.forEach(vo ->{
+			if(StringUtils.isEmpty(vo.getRealPrice())) {
+				vo.setRealPrice("0.00");
+			}
+		});
 		return new PageInfo<VideoLibraryListVO>(list);
 	}
 	/**

app/resource/src/main/java/com/zrqx/resource/commons/vo/fg/membercollection/FgMemberCollectionVo.java

@@ -44,6 +44,9 @@ public class FgMemberCollectionVo {
 	@ApiModelProperty("创建时间")
 	private Date createTime;
 	
+	@ApiModelProperty("资源状态")
+	private Integer status;
+	
 	@ApiModelProperty("图片")
 	private String cover;
 	@ApiModelProperty("0:阅读；1：加入购车；2：加入购物车(置灰)")

app/resource/src/main/java/com/zrqx/resource/fg/controller/membercollection/FgMemberCollectionController.java

@@ -105,6 +105,7 @@ public class FgMemberCollectionController {
 					li.setCover(ar.getCover());
 					li.setIntro(ar.getSynopsis());
 					li.setFromTitle(ar.getSource());
+					li.setStatus(ar.getStatus());
 				}else{
 					li.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_2.getCode());
 					li.setMessage("该资源不存在");
@@ -124,6 +125,7 @@ public class FgMemberCollectionController {
 					li.setIntro(ar.getSynopsis());
 					Integer count = resourceRelationService.queryCourseCountByVideoId(ar.getId());
 					li.setResourceNumber(count);
+					li.setStatus(ar.getStatus());
 				}else{
 					li.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_2.getCode());
 					li.setMessage("该资源不存在");