--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/shoppingcart/FgShoppingCartController.java

@@ -70,6 +70,18 @@ public class FgShoppingCartController {
 		return CallBack.success(fgShoppingCartService.batchGet(list));	
 	}
 	
+	@ApiOperation(value = "结算时是否有重复资源 0没有1有", notes = "结算时是否有重复资源")
+	@GetMapping(ResourceRequestPath.BATCH_GET + ResourceRequestPath.ISEXIST)
+	public CallBack<Integer> isContain(Integer[] ids){
+		if(ids == null || ids.length == 0){
+			throw new BaseException("ids不能为null");
+		}
+		List<Integer> list = Arrays.asList(ids).stream().map(li -> {
+			return Integer.parseInt(li.toString());
+		}).collect(Collectors.toList());
+		return CallBack.success(fgShoppingCartService.isContain(list));	
+	}
+	
 	/**
 	 * 查看购物车
 	 * @return

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/shoppingcart/FgShoppingCartService.java

@@ -69,5 +69,8 @@ public interface FgShoppingCartService extends BaseService<ShoppingCart, Integer
 
 	ShoppingCartVo batchGet(List<Integer> ids);
 
-
+	/*
+	 * 结算时是否有重复资源
+	 */
+	Integer isContain(List<Integer> list);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/shoppingcart/FgShoppingCartServiceImpl.java

@@ -177,7 +177,7 @@ public class FgShoppingCartServiceImpl extends BaseServiceImpl<ShoppingCart, Int
 				if(shoppingCartInfoVo.getSalePrice() == null || b.equals(shoppingCartInfoVo.getSalePrice())){
 					shoppingCartDeleteVos.add(shoppingCartInfoVo);
 				}
-				if("1".equals(shoppingCartInfoVo.getGoodsType())){
+				if(GoodsTypeEnum.EBOOK.getCode().equals(shoppingCartInfoVo.getGoodsType())){
 					bookId.add(shoppingCartInfoVo.getGoodsId());
 				}
 				if(StringUtils.isNotBlank(shoppingCartInfoVo.getSourceId())){
@@ -365,6 +365,23 @@ public class FgShoppingCartServiceImpl extends BaseServiceImpl<ShoppingCart, Int
 		shoppingCart.setUpdater(redis.getMember().getId());
 	}
 
-
+	/**
+	 * 结算时是否有重复资源
+	 */
+	@Override
+	public Integer isContain(List<Integer> ids) {
+		List<ShoppingCart> shoppingCarts= new ArrayList<ShoppingCart>();
+		for(Integer id : ids){
+			ShoppingCart shoppingCart = fgShoppingCartMapper.selectByPrimaryKey(id);
+			if(shoppingCart != null){
+				shoppingCarts.add(shoppingCart);
+			}
+		}
+		if(shoppingCarts.isEmpty()){
+			return null;
+		}
+		ShoppingCartVo shoppingCartVo = exchangeShoppingCartVos(shoppingCarts);
+		return shoppingCartVo.getIsContain();
+	}
 
 }