Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-04 148af6b2f57be264c84d0991237fbd7ddea491a4

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

@@ -23,6 +23,12 @@
   List<HongBaoV2> listChildrenById(Long id);

   /**
    * 获取子红包列表
    * @param idList
    * @return
    */
   List<HongBaoV2> listChildrenByIds(@Param("idList") List<Long> idList);
   /**
    * 获取奖金列表（1.4.9之前）
    * 
    * @param uid
@@ -127,7 +133,7 @@
    * @param count
    * @return
    */
   List<HongBaoV2> listCanBalanceHongBaoByTypeAndUid(@Param("types") List<Integer> type, @Param("uid") Long uid,
   List<HongBaoV2> listCanBalanceHongBaoByTypeAndUid(@Param("types") List<Integer> type, @Param("uid") Long uid, @Param("orderType") Integer orderType,
         @Param("start") long start, @Param("count") int count);

   /**
@@ -137,7 +143,7 @@
    * @param uid
    * @return
    */
   long countCanBalanceHongBaoByTypeAndUid(@Param("types") List<Integer> type, @Param("uid") Long uid);
   long countCanBalanceHongBaoByTypeAndUid(@Param("types") List<Integer> type, @Param("uid") Long uid, @Param("orderType") Integer orderType);

   /**
    * 根据用户ID，订单状态和结算时间统计邀请赚的订单数量
@@ -227,5 +233,13 @@
    */
   List<HongBaoV2> listByStateAndTypeAndUid(@Param("stateList") List<Integer> stateList,
         @Param("typeList") List<Integer> typeList, @Param("uid") Long uid,@Param("start") long start,@Param("count")int count);
	
	
   /**
    * 根据ID批量查询
    * @param idList
    * @return
    */
   List<HongBaoV2> listByIds(@Param("idList") List<Long> idList);

}