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

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

 fanli/src/main/java/com/yeshi/fanli/service/inter/redpack/RedPackExchangeService.java

@@ -34,14 +34,8 @@
    * @param uid

    * @return

    */

   public List<Long> countState(long uid);

   public Long countByUidAndState(long uid,  Integer state);



   /**

    * 统计各个状态金额

    * @param uid

    * @return

    */

   public List<BigDecimal> countMoneyState(long uid);



   /**

    * 获取申请

@@ -73,7 +67,7 @@
    * @param state

    * @return

    */

   public BigDecimal countMoneyByState(Long uid, Integer state);

   public BigDecimal countMoneyByUidAndState(Long uid, Integer state);





}