--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/resourcelibrary/FgResourceLibraryController.java

@@ -586,12 +586,21 @@ public class FgResourceLibraryController {
 			orderInfo.setType(goodsType);
 			orderInfo.setResourceTypeName(AllResourceTypeEnum.getName(Integer.parseInt(goodsType)));
 			orderInfo.setName(book.getName());
-			if(ebook.getPrice() == null){
-				orderInfo.setPrice(ebook.getRealPrice());	
+			if("11".equals(goodsType)){
+				if(ebook.getEntityPrice() == null){
+					orderInfo.setPrice(ebook.getEntityRealPrice());	
+				}else{
+					orderInfo.setPrice(ebook.getEntityPrice());	
+				}
+				orderInfo.setSalePrice(ebook.getEntityRealPrice());
 			}else{
-				orderInfo.setPrice(ebook.getPrice());	
+				if(ebook.getPrice() == null){
+					orderInfo.setPrice(ebook.getRealPrice());	
+				}else{
+					orderInfo.setPrice(ebook.getPrice());	
+				}
+				orderInfo.setSalePrice(ebook.getRealPrice());				
 			}
-			orderInfo.setSalePrice(ebook.getRealPrice());
 			//获取分类编号
 			EbookDiyType alrt = new EbookDiyType();
 			alrt.setEbookId(ebook.getId());