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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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

@@ -8,6 +8,7 @@


import javax.annotation.Resource;



import org.apache.ibatis.annotations.Param;

import org.springframework.stereotype.Service;

import org.yeshi.utils.DateUtil;



@@ -168,6 +169,15 @@
      return hongBaoV2CountMapper.countHongBaoType(dateType, type, year, startTime, endTime);

   }



	
	
   @Override

   public Integer countOrderByTypeAndDate(Integer orderType, String preDay) {

      return hongBaoV2CountMapper.countOrderByTypeAndDate(orderType, preDay);

   }

	
	
	
   @Override

   public List<ChartTDO> getProportionByType(Integer dateType, Integer type, String year, String startTime,

         String endTime) throws Exception {