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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamDailyRecordServiceImpl.java

@@ -15,6 +15,7 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.vo.order.OrderRankingVO;



@Service

public class TeamDailyRecordServiceImpl implements TeamDailyRecordService {

@@ -45,10 +46,45 @@
         record.setCountDay(new Date(TimeUtil.convertDateToTemp(gernalTime)));

         SimpleDateFormat formatMonth = new SimpleDateFormat("yyyy-MM");

         record.setYearMonth(formatMonth.format(record.getCountDay()));

			
         // 初始化数据

         initData(record);

         record.setUpdateTime(new Date());

         teamDailyRecordDao.save(record);

      }

   }



   private void initData(TeamDailyRecord record) {

      if (record.getFirstNum() == null) 
         record.setFirstDaRen(0);

      if (record.getSecondNum() == null) 
         record.setSecondNum(0);

      if (record.getBeyondNum() == null) 
         record.setBeyondNum(0);

		
      if (record.getFirstDaRen() == null) 
         record.setFirstDaRen(0);

      if (record.getSecondDaRen() == null)

         record.setSecondDaRen(0);	
      if (record.getBeyondDaRen() == null)

         record.setBeyondDaRen(0);

		
      if (record.getFirstHighVIP() == null)

         record.setFirstHighVIP(0);

      if (record.getSecondHighVIP() == null)

         record.setSecondHighVIP(0);

      if (record.getBeyondHighVIP() == null)

         record.setBeyondHighVIP(0);

		
      if (record.getFirstSuperVIP() == null)

         record.setFirstSuperVIP(0);

      if (record.getSecondSuperVIP() == null)

         record.setSecondSuperVIP(0);

      if (record.getBeyondSuperVIP() == null)

         record.setBeyondSuperVIP(0);

   }

	
	
   @Override

   public String createId(Long uid, Date date) {

      String gernalTime = TimeUtil.getGernalTime(date.getTime());

@@ -75,4 +111,26 @@
   public List<TeamDailyRecord> sumGroupByYearMonth(Long uid, Date minTime, Date maxTime) {

      return teamDailyRecordDao.sumGroupByYearMonth(uid, minTime, maxTime);

   }

	
	
   @Override

   public List<TeamDailyRecord> sumTeamNumGroupByCountDay(Long uid, Date minDay, Date maxDay) {

      return teamDailyRecordDao.sumTeamNumGroupByCountDay(uid, minDay, maxDay);

   }

	
   @Override

   public List<TeamDailyRecord> sumTeamNumGroupByYearMonth(Long uid, Date minDay, Date maxDay) {

      return teamDailyRecordDao.sumTeamNumGroupByYearMonth(uid, minDay, maxDay);

   }

	
	
   @Override

   public List<TeamDailyRecord> sumTeamNumGroupByUid(Long uid, Date minDay, Date maxDay) {

      return teamDailyRecordDao.sumTeamNumGroupByUid(uid, minDay, maxDay);

   }

	
   @Override

   public List<OrderRankingVO> getRankingByFirstNum(Long uid, Date minDay, Date maxDay) {

      return teamDailyRecordDao.getRankingByFirstNum(uid, minDay, maxDay);

   }

}