Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java

@@ -30,6 +30,13 @@
   Integer countNumberByUidAndState(@Param("uid")Long uid, @Param("state") Integer state);
   
   /**
    * 统计用户总的红包数量
    * @param uid
    * @return
    */
   Long countNumberByUid(@Param("uid")Long uid);
	
   /**
    * 统计总金额
    * @param channel 渠道
    * @param type 
@@ -118,5 +125,13 @@
   
   List<HongBaoV2VO> listShareAndInviteMoney(@Param("start") long start, @Param("count") int count,
         @Param("date") String date);
	
	
   /**
    * 统计奖励券总金额
    * @return
    */
   BigDecimal countRebateCouponMoney();
	

}