--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/ebook/SaveUpdateEbookForm.java

@@ -63,8 +63,8 @@ public class SaveUpdateEbookForm {
 	private Integer weight;
 	@ApiModelProperty("商品权重")
 	private String commodityWeight;
-	@ApiModelProperty("邮费选择")
-	private int postage;
+	@ApiModelProperty("邮费选择 0付费 1免费")
+	private Integer postage;
 	@ApiModelProperty("基础销量")
 	private String basicSales;
 	@ApiModelProperty("预售提示语")

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ebook/Book.java

@@ -83,8 +83,8 @@ public class Book {
 	private Integer weight;
 	@ApiModelProperty("商品权重")
 	private String commodityWeight;
-	@ApiModelProperty("邮费选择")
-	private int postage;
+	@ApiModelProperty("邮费选择 0付费 1免费")
+	private Integer postage=0;
 	@ApiModelProperty("基础销量")
 	private String basicSales;
 	@ApiModelProperty("预售提示语")

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ebook/BookGoods.java

@@ -35,7 +35,7 @@ public class BookGoods {
 	/**电子书价格**/
 	@ApiModelProperty("定价")
 	private BigDecimal Price;
-	@ApiModelProperty("售价 ")
+	@ApiModelProperty("售价 ") 
 	private BigDecimal sellingPrice;
 	@ApiModelProperty("价格状态  1:付费  2:免费")
 	private Integer priceType;

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/ebook/EbookVO.java

@@ -74,7 +74,7 @@ public class EbookVO {
 	@ApiModelProperty("商品权重")
 	private String commodityWeight;
 	@ApiModelProperty("邮费选择")
-	private int postage;
+	private Integer postage;
 	@ApiModelProperty("基础销量")
 	private String basicSales;
 	@ApiModelProperty("预售提示语")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/coursewarelibrary/CoursewareLibrarySerivceImpl.java

@@ -144,6 +144,9 @@ public class CoursewareLibrarySerivceImpl extends BaseServiceImpl<CoursewareLibr
 				type.setDtId(form.getDiyTypeId().get(i));
 				type.setCode(form.getDiyTypeCode().get(i));
 				type.setResourceType(9);
+				String str1=entity.getCourseware().substring(0, entity.getCourseware().indexOf("."));
+				String str2=entity.getCourseware().substring(str1.length()+1, entity.getCourseware().length());
+				entity.setFormat(str2);
 				typeList.add(type);
 			}
 			diyTypeMapper.insertUuidList(typeList);
@@ -184,6 +187,7 @@ public class CoursewareLibrarySerivceImpl extends BaseServiceImpl<CoursewareLibr
 				obj.setStatus(0);
 				obj.setIsDelete(0);
 				obj.setResourceType(9);
+				
 				list.add(obj);
 				coursewareMapper.insert(obj);
 			}else{

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java

@@ -115,7 +115,6 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 	public boolean saveOrUpdate(SaveUpdateEbookForm form) throws ParseException {
 		Book book = new Book();
 		BeanUtils.copyProperties(form, book);
-		List<ClassifyRelation> dtList = new ArrayList<ClassifyRelation>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		if (form.getDiyTypeId() == null || form.getDiyTypeId().size() == 0) {
 			throw new BaseException("参数验证失败。");