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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java

@@ -224,9 +224,21 @@
   }
   
   @Override
   public List<Long> getUidByValidOrderByDay(String preDay) {
      return commonOrderCountMapper.getUidByValidOrderByDay(preDay);
   }
	
	
   @Override
   public Integer countDownOrderUserByUidAndDate(Date preDay, List<Long> list) {
      return commonOrderCountMapper.countDownOrderUserByUidAndDate(preDay, list);
   }
	
   @Override
   public List<Long> getDownOrderUserByListUidAndDate(Date preDay, List<Long> list) {
      return commonOrderCountMapper.getDownOrderUserByListUidAndDate(preDay, list);
   }
	
   
   @Override
   public List<CountOrderDTO> countCommissionByDay(String preDay) {
@@ -330,6 +342,21 @@
      record.setId(StringUtil.Md5(preDay + trackRateEnum.name()));
      countOrderTrackRateDao.save(record);
   }
	
      
   @Override
   public Long countOrderBySourceTypeAndDay(int source, String preDay) {
      return commonOrderCountMapper.countOrderBySourceTypeAndDay(preDay, source);
   }
	
   @Override
   public long countOrderBySourceAndNearDay(Long uid, int source, int day) {
      Long count = commonOrderCountMapper.countOrderBySourceAndNearDay(uid, source, day);
      if (count  == null) {
         count = 0L;
      }
      return count;
   }
	
   
}