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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java

@@ -261,6 +261,9 @@
    * @return

    */

   public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer hbType, Integer orderState, String orderNo,

          Integer moneyState, String startTime, String endTime, List<Integer> listSource);
          Integer moneyState, String startTime, String endTime, List<Integer> listSource);



	
   public Integer countOrderByTypeAndDate(Integer orderType, String preDay);


}