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

yujian

2019-08-21 7f2f5ef5637a6871f4329e464eeba97eb59e94a3

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java

@@ -33,6 +33,9 @@
import com.yeshi.fanli.entity.bus.user.UserRank;

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

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

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

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

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

import com.yeshi.fanli.entity.integral.IntegralTaskClass.UniqueKeyEnum;

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

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

@@ -44,7 +47,9 @@
import com.yeshi.fanli.service.inter.integral.IntegralExchangeRecordService;

import com.yeshi.fanli.service.inter.integral.IntegralExchangeService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskClassService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskRankService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskService;

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

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

import com.yeshi.fanli.util.Constant;

@@ -85,9 +90,15 @@
   

   @Resource

   private IntegralDetailService integralDetailService;

	
   @Resource

   private IntegralTaskRankService integralTaskRankService;



   @Resource

   private CodePublishRecordService codePublishRecordService;

	
   @Resource

   private IntegralTaskService integralTaskService;



   /**

    * 获取任务列表

@@ -122,6 +133,7 @@
         

         // 用户签到

         Integer signState = 0;

         int signDays = 1;

         if (page == 1) {

            

            // 签到

@@ -151,7 +163,10 @@
            

            // 签到日期信息

            DailySignVO dailySignVO = integralTaskClassService.getDailySignList(uid, userRank.getId());



            if (dailySignVO != null) {

               signDays = dailySignVO.getDays();

            }

				
            boolean ejectSign = false;

            if (signState == 1) 

               ejectSign = true;

@@ -182,6 +197,20 @@
               } else if (signState == 2) {

                  taskClassVO.setLightUp(false);

               }



               // 根据天数变化更改签到金额

               Integer num = integralTaskRecordService.getNowdaySignNum(uid, taskClassVO.getId());

					
               String uniqueKeyTask = UniqueKeyEnum.dailySign.name() + num;

               IntegralTask integralTask = integralTaskService.getByCidAndUniqueKey(taskClassVO.getId(), uniqueKeyTask);

               Integer goldCoin = 0;

               if (integralTask != null) {

                  goldCoin = integralTask.getGoldCoin();

                  Integer baseDoubleNum = integralTask.getDoubleNum();

                  if (baseDoubleNum != null && baseDoubleNum > 0)

                     goldCoin = goldCoin * baseDoubleNum;

               }

               taskClassVO.setTotalCoin(goldCoin);

            } else {

               taskClassVO.setLightUp(true);

            }