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

admin

2020-06-22 b3f5e5ba3fd436f00f73cef1de6e8208fe6cf8c4

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

@@ -277,4 +277,13 @@
      return userSystemCouponCountMapper.countCouponNumByDay(typeEnum.name(), preDay);

   }

   

   @Override

   public long countCouponNum(Long uid, Integer state, Integer activated, List<String> list, List<String> listSource){

       Long count = userSystemCouponCountMapper.countCouponNum(uid, state, activated, list, listSource);

       if (count == null) 
          count = 0L;

       return count;

   }

	
	
}