金币任务签到

yujian

2019-08-21 352c7227fc3c3be1a4465bb57cefd5462240aea9

金币任务签到

 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);

                }


 fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRecordMapper.xml

@@ -103,7 +103,7 @@
  <select id="listDaySignRecord" resultMap="BaseResultMap">
     SELECT * FROM  yeshi_ec_integral_task_record  d
     WHERE d.`ir_uid` = #{uid} AND DATE_SUB(CURDATE(), INTERVAL 7 DAY) <![CDATA[<=]]> DATE(d.ir_create_time)
     ORDER BY d.ir_create_time
     ORDER BY d.ir_create_time desc
  </select>
  
  

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

@@ -71,9 +71,14 @@
            if (list != null && list.size() > 0) {

                Date today =new Date();

                for (IntegralTaskRecord record: list) {

                    if (DateUtil.daysBetween2(record.getCreateTime(),today) == 0) {

                        continue; 
                    }

					
                    if (DateUtil.daysBetween2(record.getCreateTime(),today) != 1) {

                        break; // 天数未连续

                    }

                    today = record.getCreateTime();

                    num ++ ;

                }

            }


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java

@@ -106,6 +106,10 @@
        if (rokenRecord == null)

            throw new TokenRecordException(1, "口令不存在");



        Long uidToken = rokenRecord.getUid();

        if (uid != null && uidToken != null && uid.longValue() == uidToken.longValue())

            throw new TokenRecordException(1, "不能自己赠送给自己");

		
        Date now = new Date();

        Date endTimeToken = rokenRecord.getEndTime();

        Integer stateTtoken = rokenRecord.getState();

@@ -274,7 +278,11 @@
        TokenRecord rokenRecord = tokenRecordMapper.getByToken(token);

        if (rokenRecord == null)

            throw new TokenRecordException(1, "口令已失效");



		
        Long uidToken = rokenRecord.getUid();

        if (uidToken != null && uid.longValue() == uidToken.longValue())

            throw new TokenRecordException(1, "不能自己赠送给自己");

		
        Date now = new Date();

        Date endTimeToken = rokenRecord.getEndTime();

        if (endTimeToken != null && endTimeToken.getTime() < now.getTime())