Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CollectionGoodsV2ServiceImpl.java

@@ -178,7 +178,7 @@


   @Override

   public void cancelCollectionByAuctionId(Long uid, Long auctionId, Integer goodsType) throws CollectionGoodsException {

      CollectionGoodsV2 goodsV2 = collectionGoodsV2Mapper.selectByUidAndGoodsId(uid, auctionId);

      CollectionGoodsV2 goodsV2 = collectionGoodsV2Mapper.selectByUidAndGoodsType(uid, auctionId, goodsType);

      if (goodsV2 == null)

         throw new CollectionGoodsException(1, "无收藏");

      collectionGoodsV2Mapper.deleteByPrimaryKey(goodsV2.getId());