Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-03 54c250656c2e471ad48ecaa8ccce16ec9d7eb8bd

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/CodePublishRecordServiceImpl.java

@@ -8,7 +8,9 @@
import org.springframework.stereotype.Service;



import com.yeshi.fanli.dao.mybatis.integral.CodePublishRecordMapper;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.integral.CodePublishRecord;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.integral.CodePublishRecordService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.StringUtil;

@@ -21,6 +23,9 @@
   

   @Resource

   private ThreeSaleSerivce threeSaleSerivce;



   @Resource

   private UserInfoService userInfoService;



   @Override

   public CodePublishRecord selectByPrimaryKey(Long id) {

@@ -40,11 +45,11 @@
      return codePublishRecordMapper.countValidRecord(uid, CodePublishRecord.VALIDTIME);

   }

   

	
   @Override

   public List<CodePublishRecord> listValid(long start, int count) {

      

      List<CodePublishRecord> listValid = codePublishRecordMapper.listValid(start, count, CodePublishRecord.VALIDTIME);

      List<CodePublishRecord> listValid = codePublishRecordMapper.listValid(start, count,

            CodePublishRecord.VALIDTIME);

      if (listValid == null || listValid.size() == 0) {

         return listValid;

      }

@@ -76,19 +81,29 @@
         }

         codePublishRecord.setNickName(nickName);

         

         UserInfo user = userInfoService.selectByPKey(codePublishRecord.getUid());



         long firstTeam = threeSaleSerivce.countFirstTeam(codePublishRecord.getUid(), 1);

         long secondTeam = threeSaleSerivce.countSecondTeam(codePublishRecord.getUid(), 1);

         codePublishRecord.setTeam(firstTeam + secondTeam);

         if (user != null && user.getType() == 1) {// 假用户

            long s = Integer

                  .parseInt((206 * (6365705L - codePublishRecord.getUid()) / (6365705L - 6315822L) + 82) + "");

            codePublishRecord.setTeam(s + codePublishRecord.getTeam());

         }

      }

      

      return listValid;

   }



   @Override

   public List<CodePublishRecord> listByMinTime(long start, int count, Date minTime) {

      return codePublishRecordMapper.listByMinTime(start, count, minTime);

   }



   @Override

   public long countValid() {

      return codePublishRecordMapper.countValid(CodePublishRecord.VALIDTIME);

   }



   

}