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

admin

2019-09-02 34b542007f7e0dd4e1fdffecbd12a377aa953d68

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java

@@ -69,5 +69,14 @@
    * @return

    */

   BigDecimal getMoneyByOrderNo(String orderNo);

	
	
   /**

    * 统计已到账返利订单

    * @param uid

    * @param dateTime

    * @return

    */

   public long countValidOrderByDate(Long uid, String dateTime);



}