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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/TeamEincomeRecordServiceImpl.java

@@ -84,5 +84,17 @@
   public long countCanRecieveUid(Date preRecieveTime, List<Integer> typeList) {

      return teamEincomeRecordMapper.countCanRecieveUid(preRecieveTime, typeList);

   }

	
	
   @Override

   public BigDecimal sumRecieveByType(Long uid, int type) {

      BigDecimal money = teamEincomeRecordMapper.sumRecieveByType(uid, type);

      if (money == null) {

         money = new BigDecimal(0);

      }

      return money;

   }

	
	


}