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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

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

@@ -211,6 +211,9 @@
         @Param("payment") BigDecimal payment);

   

   

   Long countOrderByUidAndSettled(@Param("uid") Long uid, @Param("limitTime") long limitTime,

         @Param("payment") BigDecimal payment);

	
   

   /**

    *  注：1笔且付款总金额不小于 payment 元（退款为失效

@@ -241,7 +244,7 @@
    * @param preDay

    * @return

    */

   Integer countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);

   Long countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);

   

   

}