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/ThreeSaleSerivceImpl.java

@@ -257,21 +257,21 @@


   @Override

   public JSONObject getMyFirstTeam(long start, int count, Long uid) {

      List<ThreeSale> list = threeSaleMapper.listFirstTeam(start, count, uid);

      List<ThreeSale> list = threeSaleMapper.listFirstTeam(start, count, uid, null);

      if (list == null) {

         list = new ArrayList<ThreeSale>();

      }

      long countTotal = threeSaleMapper.countFirstTeam(uid);

      long countTotal = threeSaleMapper.countFirstTeam(uid, null);

      return organizeTeam(countTotal, list);

   }



   @Override

   public JSONObject getMySecondTeam(long start, int count, Long uid) {

      List<ThreeSale> list = threeSaleMapper.listSecondTeam(start, count, uid);

      List<ThreeSale> list = threeSaleMapper.listSecondTeam(start, count, uid, null);

      if (list == null) {

         list = new ArrayList<ThreeSale>();

      }

      long countTotal = threeSaleMapper.countSecondTeam(uid);

      long countTotal = threeSaleMapper.countSecondTeam(uid, null);

      return organizeTeam(countTotal, list);

   }



@@ -490,22 +490,52 @@


   @Override

   public List<ThreeSale> listFirstTeam(long start, int count, Long uid) {

      return threeSaleMapper.listFirstTeam(start, count, uid);

      return threeSaleMapper.listFirstTeam(start, count, uid, null);

   }



   @Override

   public List<ThreeSale> listSecondTeam(long start, int count, Long uid) {

      return threeSaleMapper.listSecondTeam(start, count, uid);

      return threeSaleMapper.listSecondTeam(start, count, uid, null);

   }



   @Override

   public List<ThreeSale> listFirstTeam(long start, int count, Long uid, List<Long> listId) {

      return threeSaleMapper.listFirstTeam(start, count, uid, listId);

   }



   @Override

   public List<ThreeSale> listSecondTeam(long start, int count, Long uid, List<Long> listId) {

      return threeSaleMapper.listSecondTeam(start, count, uid, listId);

   }



   @Override

   public long countFirstTeam(Long uid) {

      return threeSaleMapper.countFirstTeam(uid);

      return threeSaleMapper.countFirstTeam(uid, null);

   }



   @Override

   public long countSecondTeam(Long uid) {

      return threeSaleMapper.countSecondTeam(uid);

      return threeSaleMapper.countSecondTeam(uid, null);

   }



   @Override

   public long countFirstTeam(Long uid, List<Long> listId) {

      return threeSaleMapper.countFirstTeam(uid, listId);

   }



   @Override

   public long countSecondTeam(Long uid, List<Long> listId) {

      return threeSaleMapper.countSecondTeam(uid, listId);

   }



   @Override

   public long countFirstTeamByDate(Long uid, int dayType) {

      return threeSaleMapper.countFirstTeamByDate(uid, dayType);

   }



   @Override

   public long countSecondTeamByDate(Long uid, int dayType) {

      return threeSaleMapper.countSecondTeamByDate(uid, dayType);

   }



   @Override

@@ -564,4 +594,22 @@
      return bossUid;

   }



   @Override

   public List<ThreeSale> listAll(Date minTime, Date maxTime, int page, int pageSize) {

      return threeSaleMapper.listAll(minTime == null ? null : minTime.getTime(),

            maxTime == null ? null : maxTime.getTime(), (page - 1) * pageSize, pageSize);

   }



   @Override

   public long countAll(Date minTime, Date maxTime) {

      return threeSaleMapper.countAll(minTime == null ? null : minTime.getTime(),

            maxTime == null ? null : maxTime.getTime());

   }



	
   @Override

   public List<Long> getAllBossId(){

      return threeSaleMapper.getAllBossId();

   }



}