Merge remote-tracking branch 'origin/master'

admin

2019-03-04 4b80d2dab78d0cef3d149a0a11240b5e39b581a3

 fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java

@@ -239,5 +239,17 @@
      return countOrderNumberBySettleTime(uid, 2, 4); // 根据

   }

   

   @Override

   public boolean hasRebateAndShareOrder(Long uid) {

      boolean has = false;

		
      long count = commonOrderCountMapper.countValidOrder(uid);

      if (count > 0) {

         has = true; 
      }

		
      return has;

   }

	
   

}