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

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java

@@ -329,4 +329,11 @@
    * @return

    */

   BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(@Param("orderNo") String orderNo, @Param("sourceType") Integer sourceType);

	
   /**

    * 统计24小时有效自购订单

    * @param uid

    * @return

    */

   long count24HValidOrderByUid(@Param("uid") Long uid, @Param("minTime") Date minTime);

}