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

admin

2020-03-15 b16f2b0126281e87346db9e6efd1db960ecc872a

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java

@@ -31,6 +31,17 @@
   Long countOrderBySourceTypeAndDay(@Param("preDay") String preDay, @Param("sourceType") int sourceType);

   
   /**
    * 统计所有订单
    * 
    * @param channel
    * @return
    */
   List<ChartTDO> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
         @Param("startTime") String startTime, @Param("endTime") String endTime,
         @Param("sourceType") int sourceType);

	
   
   /**
    * 奖金统计