--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebooklibrary/EbookLibraryController.java

@@ -42,7 +42,6 @@ import com.zrqx.core.model.resource.ebook.BookIssued;
 import com.zrqx.core.model.resource.ebook.BookLabelDiyType;
 import com.zrqx.core.model.resource.ebook.BookResource;
 import com.zrqx.core.model.resource.ebook.Ebook;
-import com.zrqx.core.model.resource.imagelibrary.ImageGoods;
 import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
 import com.zrqx.core.model.resource.imagelibrary.ImageLibraryDiyType;
 import com.zrqx.core.util.CallBack;
@@ -266,7 +265,7 @@ public class EbookLibraryController {
 	@ApiOperation(value = "批量删除", notes = "批量删除")
 	@PostMapping(value = ResourceRequestPath.BATCH_DELETE)
 	public CallBack<Boolean> delete(@RequestBody List<String> ids) {
-		return CallBack.success(ebookservice.batchDelete(ids));
+		return CallBack.success(bookservice.batchDelete(ids));
 	}
 
 	@ApiOperation("查询电子书列表")
@@ -374,4 +373,9 @@ public class EbookLibraryController {
 		});
 		return CallBack.success(resourceService.insertUuidList(recordList));
 	}
+	@ApiOperation(value = "批量删除关联资源", notes = "批量删除")
+	@PostMapping(value = ResourceRequestPath.BATCH_RELATION_DELETE)
+	public CallBack<Boolean> deleteByResourceIds(@RequestBody List<String> ids) {
+		return CallBack.success(resourceService.batchDeleteResource(ids));
+	}
 }

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

 package com.zrqx.resource.bg.service.ebook;
 
+import java.util.List;
+
 import com.zrqx.core.model.resource.ebook.Book;
 import com.zrqx.core.service.BaseService;
 
@@ -9,4 +11,6 @@ import com.zrqx.core.service.BaseService;
  * @date 2018年7月13日上午10:05:18
  */
 public interface BookService extends BaseService<Book, String> {
+
+	boolean batchDelete(List<String> ids);
 }

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

 package com.zrqx.resource.bg.service.ebook;
 
+import java.util.List;
+
 import org.apache.log4j.Logger;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.form.recyclebin.SaveResourceForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.ebook.Book;
+import com.zrqx.core.model.resource.ebook.BookGoods;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.resource.bg.mapper.ebook.BookMapper;
+import com.zrqx.resource.bg.service.recycleBin.ResourceRecycleBinService;
 
 /**
  * 商品-serviceimpl
@@ -20,10 +27,39 @@ public class BookServiceImpl extends BaseServiceImpl<Book, String> implements
 	private static final Logger log = Logger.getLogger(BookServiceImpl.class);
 	@Autowired
 	private BookMapper bookMapper;
+	@Autowired
+	private BookGoodsService bookGoodsService;
+	@Autowired
+	private ResourceRecycleBinService binService;
 	
 	@Override
 	public BaseMapper<Book> getMapper() {
 		return bookMapper;
 	}
 
+	@Override
+	public boolean batchDelete(List<String> ids) {
+		if (ids.size() == 0) {
+			throw new BaseException("没有选中任何数据，请重新选择");
+		}
+		createCriteria().andIn("id", ids);
+		List<Book> list = bookMapper.selectByExample(example);
+		for (Book entity : list) {
+			if (entity.getBookStatus() == 1) {
+				throw new BaseException("不能删除审核通过的资源");
+			}
+			entity.setIsDelete(1);
+			bookMapper.updateByPrimaryKeySelective(entity);
+			// 删除后的资源加入回收站
+			SaveResourceForm form = new SaveResourceForm();
+			BeanUtils.copyProperties(entity, form);
+			bookGoodsService.createCriteria().andEqualTo("objectId", entity.getId());
+			BookGoods goods = bookGoodsService.selectOneByCriteria();
+			form.setSellingPrice(goods.getSellingPrice());
+			form.setPriceType(goods.getPriceType());
+			binService.saveResource(form);
+		}
+		return false;
+	}
+
 }