Merge remote-tracking branch 'origin/master'

admin

2019-01-10 02d8f36a2a51a2ffcacdb619bee34077da61b328

 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoService.java

@@ -321,4 +321,20 @@
    */

   public List<HongBao> listShareAndInviteMoney(long start, int count, String date);



   /**

    * 根据渠道   统计历史产生的订单数量

    * @param channel

    * @return

    */

   public List<Object> countHistoryOderByChannel(String channelArray, Integer type, String year,

         String startTime, String endTime) throws Exception;



   /**

    * 根据渠道   统计新增用户24小时内产生的订单数量

    * @param channel

    * @return

    */

   public List<Object> count24HOderByChannel(String channel, Integer type, String years,

         String startTime, String endTime) throws Exception;



}