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

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -1605,4 +1605,10 @@
   public BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(String orderNo, Integer sourceType) {

      return commonOrderMapper.getTotalRewardMoneyByOrderNoAndSourceType(orderNo, sourceType);

   }

	
	
   @Override

   public long count24HValidOrderByUid(Long uid, Date minTime) {

      return commonOrderMapper.count24HValidOrderByUid(uid, minTime);

   }

}