From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java | 117 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 85 insertions(+), 32 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 62914cc..6bce305 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
@@ -2,12 +2,15 @@
import java.util.List;
-import net.sf.json.JSONObject;
-
+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.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
+import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
+
+import net.sf.json.JSONObject;
public interface UserShareGoodsRecordService {
@@ -18,29 +21,30 @@
public int updateByPrimaryKeySelective(UserShareGoodsRecord record);
public UserShareGoodsRecord selectByPrimaryKey(Long id);
-
+
/**
* 鏌ヨ鐢ㄦ埛瀵瑰簲鐨勯�夊搧搴�
+ *
* @param start
* @param count
* @param uid
* @return
*/
public List<UserShareGoodsRecord> listQueryByUid(long start, int count, Long uid, String source);
-
- public long countQueryByUid(Long uid, String source);
+ public long countQueryByUid(Long uid, String source);
/**
* 缁熻璁板綍
+ *
* @param list
* @return
*/
public List<UserShareGoodsRecord> listCountRecord(List<Long> list);
-
/**
* 鑾峰彇鍒嗕韩璁板綍
+ *
* @param start
* @param count
* @param uid
@@ -49,30 +53,11 @@
*/
public List<UserShareGoodsRecord> getMyShareGoodsRecords(long start, int count, Long uid, String source);
- /**
- * 澶氫釜鍟嗗搧鍒嗕韩
- * @param uid 鐢ㄦ埛id
- * @param source 鏉ユ簮
- * @param title 鏍囬鍐呭
- * @param listGoods 鍟嗗搧闆嗗悎
- * @throws UserShareGoodsRecordException
- */
- public JSONObject save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods)
- throws UserShareGoodsRecordException;
+
/**
- * 鍗曚釜鍟嗗搧鍒嗕韩
- * @param uid 鐢ㄦ埛id
- * @param source 鏉ユ簮
- * @param taoBaoGoodsBrief 鍟嗗搧
- * @throws UserShareGoodsRecordException
- */
- public void save(Long uid, ShareSourceTypeEnum source, String title, TaoBaoGoodsBrief taoBaoGoodsBrief)
- throws UserShareGoodsRecordException;
-
-
- /**
* 鏌ヨ宸插垎浜晢鍝�
+ *
* @param recordId
* @return
* @throws UserShareGoodsRecordException
@@ -81,6 +66,7 @@
/**
* h5鍒嗕韩鍟嗗搧鍒楄〃
+ *
* @param recordId
* @return
* @throws UserShareGoodsRecordException
@@ -88,19 +74,86 @@
public JSONObject getGoodsGroupDetail(Long recordId) throws UserShareGoodsRecordException;
/**
- * 鏇存柊鍒嗕韩璁板綍
+ * 鍒嗕韩璁板綍鐢熸晥
+ *
* @param shareId
* @throws UserShareGoodsRecordException
*/
- public void updateShareRecord(Long shareId) throws UserShareGoodsRecordException;
+ public void takeEffectShareRecord(AcceptData acceptData, String shareKey) throws UserShareGoodsRecordException;
+
/**
- *
+ * 鍒嗕韩璁板綍璁℃暟
+ * @param uid
+ * @return
+ */
+ public long countShareRecordByUid(Long uid);
+
+
+
+ /**
+ * 淇濆瓨鍗曚釜鍟嗗搧鍒嗕韩璁板綍
* @param uid
* @param auctionId
* @param type
* @throws UserShareGoodsRecordException
*/
- public void saveDetail(Long uid, Long auctionId, String type) throws UserShareGoodsRecordException;
+ public void saveSingleShareRecord(Long uid, Long auctionId, Integer goodsType) throws UserShareGoodsRecordException;
+
+ /**
+ * 鍟嗗搧璇︽儏鍒嗕韩
+ * @param uid
+ * @param auctionId
+ * @return
+ * @throws UserShareGoodsRecordException
+ */
+ public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType, boolean isTaolijin) throws UserShareGoodsRecordException;
+
+ /**
+ * 閫夊搧搴撳晢鍝佸垎浜�
+ * @param uid
+ * @param list
+ * @return
+ * @throws UserShareGoodsRecordException
+ */
+ public ShareGoodsRecordDTO addRecordGoodsStorage(Long uid,List<TaoBaoGoodsBrief> listGoodsBrief, List<Long> listStorageID) throws UserShareGoodsRecordException;
+
+ /**
+ * 鑰佺増鍔ㄦ�佸垎浜�
+ * @param uid
+ * @param activityId
+ * @param title
+ * @param listGoodsBrief
+ * @return
+ * @throws UserShareGoodsRecordException
+ */
+ public ShareGoodsRecordDTO addRecordActivity(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief)
+ throws UserShareGoodsRecordException;
+
+ /**
+ * 鏂扮増鍔ㄦ�佸垎浜�
+ * @param uid
+ * @param dynamicId
+ * @param title
+ * @param listGoodsBrief
+ * @return
+ * @throws UserShareGoodsRecordException
+ */
+ public ShareGoodsRecordDTO addRecordDynamic(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief)
+ throws UserShareGoodsRecordException;
+
+ public List<UserShareGoodsGroup> listByRecordId(Long shareId);
+
+ 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;
+
}
--
Gitblit v1.8.0