From a39422f2a8ce45dd6cf65701ed5f9e65391c46c1 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期二, 23 七月 2019 11:03:35 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java index 73b1aa9..1dbf88c 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java @@ -3,6 +3,7 @@ import java.util.List; import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO; +import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup; import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.exception.share.UserShareGoodsRecordException; @@ -95,7 +96,7 @@ * @param type * @throws UserShareGoodsRecordException */ - public void saveSingleShareRecord(Long uid, Long auctionId) throws UserShareGoodsRecordException; + public void saveSingleShareRecord(Long uid, Long auctionId, Integer goodsType) throws UserShareGoodsRecordException; /** @@ -105,7 +106,7 @@ * @return * @throws UserShareGoodsRecordException */ - public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId) throws UserShareGoodsRecordException; + public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType) throws UserShareGoodsRecordException; /** * 閫夊搧搴撳晢鍝佸垎浜� @@ -114,7 +115,7 @@ * @return * @throws UserShareGoodsRecordException */ - public ShareGoodsRecordDTO addRecordGoodsStorage(Long uid,List<TaoBaoGoodsBrief> listGoodsBrief) throws UserShareGoodsRecordException; + public ShareGoodsRecordDTO addRecordGoodsStorage(Long uid,List<TaoBaoGoodsBrief> listGoodsBrief, List<Long> listStorageID) throws UserShareGoodsRecordException; /** * 鑰佺増鍔ㄦ�佸垎浜� @@ -139,5 +140,7 @@ */ public ShareGoodsRecordDTO addRecordDynamic(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief) throws UserShareGoodsRecordException; + + public List<UserShareGoodsGroup> listByRecordId(Long shareId); } -- Gitblit v1.8.0