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

yujian

2020-04-16 c57f9a24c525aa557225b663fa55120a36f99735

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

@@ -283,6 +283,8 @@
    * @param payment

    * @return

    */

   public long countOrderByUidAndSettled(Long uid, Long time, BigDecimal payment);
   public long countOrderByUidAndSettled(Long uid, Long time, BigDecimal payment);



   public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState);


}