yujian
2019-11-04 148af6b2f57be264c84d0991237fbd7ddea491a4
fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java
@@ -236,16 +236,10 @@
            totalGoldCoin += record.getGoldCoin();
      }
      Integer goldCoin = userInfoExtra.getGoldCoin();
      if (goldCoin == null)
         goldCoin = 0;
      goldCoin = goldCoin + totalGoldCoin;
      // 更新金币
      userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), goldCoin);
      userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), totalGoldCoin);
      return goldCoin;
      return totalGoldCoin+(userInfoExtra.getGoldCoin()==null?0:userInfoExtra.getGoldCoin());
   }
   @Transactional
@@ -312,7 +306,7 @@
         FrequencyEnum frequency = integralTask.getFrequency();
         if (frequency == FrequencyEnum.everyday) {
            int num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId,
                  TimeUtil.getWholeTime(record.getCreateTime().getTime()));
                  TimeUtil.getWholeTime(record.getCreateTime().getTime()), record.getId());
            if (num <= 0)
               num = 1;
            String title = taskClass.getName() + "-" + integralTask.getName() + "-第" + num + "次";
@@ -381,6 +375,14 @@
      return integralTaskRecordMapper.listByUidAndTaskId(uid, taskId, (page - 1) * count, count);
   }
   @Override
   public long getTotalGoldCoinByUid(Long uid) {
      return integralTaskRecordMapper.getTotalGoldCoinByUid(uid);
   }
   @Async()
   @Override
   public void firstRebateOrderRewardBoss(Long uid, Long originUid, String beizu) {