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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

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

@@ -274,6 +274,17 @@
    * @param type 订单类型

    * @return

    */

   public long counOrderByUidAndOrderType(Long uid, BigDecimal payment, int type);
   public long counOrderByUidAndOrderType(Long uid, BigDecimal payment, int type);



   /**

    * 统计已结算

    * @param uid

    * @param time

    * @param payment

    * @return

    */

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



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


}