Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java

@@ -3,8 +3,10 @@
import java.util.List;



import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;



@@ -77,7 +79,7 @@
    * @param shareId

    * @throws UserShareGoodsRecordException

    */

   public void takeEffectShareRecord(String shareKey) throws UserShareGoodsRecordException;

   public void takeEffectShareRecord(AcceptData acceptData, String shareKey) throws UserShareGoodsRecordException;





   /**

@@ -106,7 +108,7 @@
    * @return

    * @throws UserShareGoodsRecordException

    */

   public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType) throws UserShareGoodsRecordException;

   public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType, boolean isTaolijin) throws UserShareGoodsRecordException;



   /**

    * 选品库商品分享

@@ -143,7 +145,15 @@


   public List<UserShareGoodsGroup> listByRecordId(Long shareId);



   public ShareGoodsRecordDTO addRecordGoodsStorageV2(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief,

         List<Long> listStorageID) throws UserShareGoodsRecordException;

   public ShareGoodsRecordDTO addRecordGoodsStorageV2(Long uid, List<CommonGoods> listCommonGoods,

         List<Long> listStorageID,boolean needDrawPicture) throws UserShareGoodsRecordException;



   /**

    * 创建分享记录

    * @param uid

    * @param goods

    * @throws UserShareGoodsRecordException

    */

   public void saveShareRecord(Long uid, CommonGoods goods) throws UserShareGoodsRecordException;

   

}