Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java

@@ -218,6 +218,12 @@
   long countQueryByFlashSale();

   /**
    * 限时秒杀 随机3个商品
    * @return
    */
   List<QualityFactory> listFlashSaleRandGoods();
	
   /**
    * 返利金额数据查询
    * 
    * @param start
@@ -326,4 +332,17 @@
   
   long countFreeGoods(@Param("tkRate") Double tkRate, @Param("lableName") String lableName);

	
   /**
    * 根据店铺信息获取商品
    * @param start
    * @param count
    * @param shopId
    * @return
    */
   List<QualityFactory> listByShopId(@Param("start") long start, @Param("count") int count, 
         @Param("shopId") Long shopId);
	
   long countByShopId(@Param("shopId") Long shopId);

}