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

yujian

2020-04-23 2bd2200f209ddb7bcc59b636d9de6f8b3f762958

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

@@ -150,11 +150,10 @@
   /**

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

    * @param uid

    * @param list 类型

    * @param payment

    * @return

    */

   Long counOrderByUidAndOrderType(@Param("uid") Long uid, @Param("payment") BigDecimal payment,

         @Param("type") int type);

   Long countMyDirectOrderByCashArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment);