Merge branch 'master' into dev-moneydetail

admin

2018-12-19 d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java

@@ -140,6 +140,15 @@
   int getCountByUid(@Param("uid") Long uid);

   /**
    * 统计已经到账的订单数量
    * 
    * @param uid
    * @param state
    * @return
    */
   int getCountByUidAndState(@Param("uid") Long uid, @Param("state") int state);

   /**
    * 统计记录 失效订单数
    * 
    * @param uid