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/dynamic/GoodsEvaluateService.java |   62 ++++++++++++++++++++++++++-----
 1 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/GoodsEvaluateService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/GoodsEvaluateService.java
index 803f9e6..2bb7781 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/GoodsEvaluateService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/GoodsEvaluateService.java
@@ -1,14 +1,18 @@
 package com.yeshi.fanli.service.inter.dynamic;
 
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.entity.bus.activity.ActivityUser;
 import com.yeshi.fanli.entity.dynamic.CommentInfo;
-import com.yeshi.fanli.entity.dynamic.DynamicInfo;
 import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
 import com.yeshi.fanli.entity.dynamic.ImgInfo;
+import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.dynamic.GoodsEvaluateException;
 
 public interface GoodsEvaluateService {
@@ -39,9 +43,9 @@
 	 * @param state
 	 * @return
 	 */
-	public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType);
+	public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType, String typeEnum);
 
-	public long count(String key, Integer state,int dynamicType);
+	public long count(String key, Integer state,int dynamicType, String typeEnum);
 
 	
 	/**
@@ -75,7 +79,7 @@
 	 * @throws GoodsEvaluateException
 	 * @throws Exception
 	 */
-	public void saveSingleGoods(String pid, Long goodsId, Integer goodsType, String videoUrl, Integer picNum, String picUrls,
+	public String saveSingleGoods(String pid, Long goodsId, Integer goodsType, String videoUrl, Integer picNum, String picUrls,
 			MultipartHttpServletRequest fileRequest) throws GoodsEvaluateException, Exception;
 
 	/**
@@ -85,10 +89,10 @@
 	 * @throws GoodsEvaluateException
 	 * @throws Exception
 	 */
-	public void saveSingleGoodsCoupon(String pid, CommentInfo commentInfo) throws GoodsEvaluateException, Exception;
+	public void saveCurrencyCoupon(String pid, int kind, CommentInfo commentInfo) throws GoodsEvaluateException, Exception;
 
 
-	public void saveActivityPic(String pid, ImgInfo imgInfo, MultipartHttpServletRequest fileRequest)
+	public void saveActivityPic(String pid, ImgInfo imgInfo, String picUrls, MultipartHttpServletRequest fileRequest)
 			throws GoodsEvaluateException, Exception;
 
 
@@ -124,18 +128,56 @@
 	 * @param count
 	 * @return
 	 */
-	public List<GoodsEvaluate> queryMaterialsCache(int start, int count,int type);
+	public List<GoodsEvaluate> queryMaterialsCache(int start, int count,int type) throws Exception;
 
 	public long countValidMaterials(int type);
 
-
-	public void saveGoodsCoupon(String pid, String tags, String content) throws GoodsEvaluateException, Exception;
 
 
 	public void release(String id) throws GoodsEvaluateException;
 
 
-	public void addGoodsEvaluateByDynamicInfo(DynamicInfo info);
+	public void saveGoodsComment(String id, int kind, List<CommentInfo> comments) throws GoodsEvaluateException, Exception;
 
 
+	/**
+	 * 鑷姩鐢熸垚鏁版嵁
+	 */
+	public void addGoodsEvaluateByDaTaoKe();
+
+
+	public void updateTaoBaoGoods(TaoBaoGoodsBrief goods);
+
+
+	public void updateJDGoods(JDGoods jdGoods);
+
+
+	public void updatePDDGoods(PDDGoodsDetail pddGoods);
+
+
+	public void addRanDomShareCount();
+
+	/**
+	 *  娣诲姞鍙戝湀鍐呭
+	 * @param goodsId 鍟嗗搧id  蹇呬紶
+	 * @param cid 澶ф窐瀹㈠垎绫籭d  蹇呬紶
+	 * @param title 鏍囬    蹇呬紶
+	 * @param comment
+	 */
+	public void addGoodsEvaluate(Long goodsId,List<ImgInfo> imgList, ActivityUser user, String title,String comment,Date startTime) throws GoodsEvaluateException;
+
+	
+	/**
+	 * 涓嬫灦鍟嗗搧
+	 * @param goodsId
+	 */
+	public void offlineTaoBaoGoods(Long goodsId);
+
+	/**
+	 * 鐘舵�佸垏鎹�
+	 * @param id
+	 * @throws GoodsEvaluateException
+	 */
+	public void switchState(String id) throws GoodsEvaluateException;
+
 }

--
Gitblit v1.8.0