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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java

@@ -198,6 +198,28 @@
    * @return
    */
   public Integer countOderByUidAndLess10(Long uid);

   


   public Long countOrderBySourceTypeAndDay(int source, String preDay);


   public List<Long> getDownOrderUserByListUidAndDate(Date preDay, List<Long> list);

   /**
    * 查询当日下单用户
    * @param preDay
    * @return
    */
   public List<Long> getUidByValidOrderByDay(String preDay);


   /**
    * 统计最近day天有效订单数量
    * @param uid
    * @param source
    * @param day
    * @return
    */
   public long countOrderBySourceAndNearDay(Long uid, int source, int day);
}