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 | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 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 96f1861..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,13 +1,14 @@ 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; @@ -42,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); /** @@ -91,7 +92,7 @@ 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; @@ -132,11 +133,8 @@ public long countValidMaterials(int type); - public void saveGoodsCoupon(String pid, String content) throws GoodsEvaluateException, Exception; - public void release(String id) throws GoodsEvaluateException; - public void saveGoodsComment(String id, int kind, List<CommentInfo> comments) throws GoodsEvaluateException, Exception; @@ -166,7 +164,20 @@ * @param title 鏍囬 蹇呬紶 * @param comment */ - public void addGoodsEvaluate(Long goodsId, Integer cid, String title, String comment) throws GoodsEvaluateException; + 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