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

yujian

2020-06-01 824d003d330a25b1f5b1e9ed30e4ad868868c2ab

 fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/GoodsEvaluateService.java

@@ -7,6 +7,8 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;

import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.suning.SuningGoodsInfo;
import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
import com.yeshi.fanli.entity.bus.activity.ActivityUser;
import com.yeshi.fanli.entity.dynamic.CommentInfo;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
@@ -79,7 +81,7 @@
    * @throws GoodsEvaluateException
    * @throws Exception
    */
   public String saveSingleGoods(String pid, Long goodsId, Integer goodsType, String videoUrl, Integer picNum, String picUrls,
   public String saveSingleGoods(String pid, String goodsId, Integer goodsType, String videoUrl, Integer picNum, String picUrls,
         MultipartHttpServletRequest fileRequest) throws GoodsEvaluateException, Exception;

   /**
@@ -153,6 +155,11 @@


   public void updatePDDGoods(PDDGoodsDetail pddGoods);
	
	
   public void updateVIPGoods(VIPGoodsInfo goods);
	
   public void updateSuningGoods(SuningGoodsInfo goods);


   public void addRanDomShareCount();
@@ -164,14 +171,14 @@
    * @param title 标题    必传
    * @param comment
    */
   public void addGoodsEvaluate(Long goodsId,List<ImgInfo> imgList, ActivityUser user, String title,String comment,Date startTime) throws GoodsEvaluateException;
   public void addGoodsEvaluate(String goodsId,List<ImgInfo> imgList, ActivityUser user, String title,String comment,Date startTime) throws GoodsEvaluateException;

   
   /**
    * 下架商品
    * @param goodsId
    */
   public void offlineTaoBaoGoods(Long goodsId);
   public void offlineTaoBaoGoods(String goodsId);

   /**
    * 状态切换