Merge remote-tracking branch 'origin/master'

admin

2019-03-15 a8e45a802600ca1cde28fe8522a26635328bbd99

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendUserGoodsServiceImpl.java

@@ -31,7 +31,7 @@


   @Transactional

   @Override

   public void addRecommend(Long uid, String recommendDesc, List<CommonGoods> goodsList)

   public void addRecommend(Long uid, String device, String recommendDesc, List<CommonGoods> goodsList)

         throws RecommendUserGoodsException {

      if (goodsList == null || goodsList.size() == 0)

         throw new RecommendUserGoodsException(1, "无推荐商品");

@@ -40,6 +40,7 @@
      goods.setCreateTime(new Date());

      goods.setRecommendDesc(recommendDesc);

      goods.setUser(new UserInfo(uid));

      goods.setDevice(device);

      recommendUserGoodsMapper.insertSelective(goods);

      for (CommonGoods commonGoods : goodsList)

         try {

@@ -74,5 +75,20 @@
   public RecommendUserGoods getLatestRecommendUserGoods(Long uid) {

      return recommendUserGoodsMapper.getLatestRecommendUserGoods(uid);

   }

	
   @Override

   public RecommendUserGoods getLatestRecommendUserGoodsByDevice(String device) {

      return recommendUserGoodsMapper.getLatestRecommendUserGoodsByDevice(device);

   }



   @Override

   public List<RecommendUserGoods> listRecommendGoodsByDevice(String device, int page, int pageSize) {

      return recommendUserGoodsMapper.listRecommendGoodsByDevice(device, (page - 1) * pageSize, pageSize);

   }

	
   @Override

   public long countRecommendGoodsByDevice(String device) {

      return recommendUserGoodsMapper.countRecommendGoodsByDevice(device);

   }



}