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/integral/CodePublishRecordServiceImpl.java

@@ -46,9 +46,9 @@
   }



   @Override

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

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



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

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

            CodePublishRecord.VALIDTIME);

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

         return listValid;

@@ -82,14 +82,14 @@
         codePublishRecord.setNickName(nickName);



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



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

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

         codePublishRecord.setTeam(firstTeam + secondTeam);

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

            long s = Integer

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

            codePublishRecord.setTeam(s);

         } else {// 真用户

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

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

            codePublishRecord.setTeam(firstTeam + secondTeam);

                  .parseInt((180 * (6365705L - codePublishRecord.getUid()) / (6365705L - 6315822L) + 20) + "");

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

         }

      }