自购立减/分享爆款返回数据修改修改

admin

2019-08-28 a99de6e3ab8c984ad274f53ac350fa56548f2374

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java

@@ -13,9 +13,9 @@
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

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

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

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

import com.yeshi.fanli.entity.integral.IntegralTask.FrequencyEnum;

import com.yeshi.fanli.entity.integral.IntegralTask.TaskUniqueKeyEnum;

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

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

import com.yeshi.fanli.exception.integral.IntegralGetException;

import com.yeshi.fanli.exception.integral.IntegralTaskRecordException;

@@ -44,10 +44,10 @@


   @Resource

   private RedisManager redisManager;

	


   @Resource

   private UserInfoExtraService userInfoExtraService;

	


   @Resource

   private IntegralTaskRankService integralTaskRankService;



@@ -79,19 +79,19 @@
         if (count > 0)

            throw new IntegralGetException(2, "事件触发达到上限");

      }

		


      UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

      if (userInfoExtra == null)

         throw new IntegralGetException(2, "额外信息不存在");

		


      UserRank userRank = userInfoExtra.getUserRank();

      if (userRank == null)

         throw new IntegralGetException(2,"等级信息不存在");

         throw new IntegralGetException(2, "等级信息不存在");



      int goldCoin = task.getGoldCoin();

      if (task.getDoubleNum() != null && task.getDoubleNum() > 0)

         goldCoin = task.getDoubleNum() * goldCoin;

		


      Long taskId = task.getId();

      IntegralTaskRank traskRank = integralTaskRankService.getByTsakIdAndRankId(taskId, userRank.getId());

      if (traskRank != null) {