记得上下班打卡 | git大法好,push需谨慎

Commit 97c5e1d2 authored by 胡佳晨's avatar 胡佳晨

修改接口

parent a9a71f5b
...@@ -18,6 +18,11 @@ public class StoneTaskVo implements Serializable,Cloneable { ...@@ -18,6 +18,11 @@ public class StoneTaskVo implements Serializable,Cloneable {
*/ */
private String taskName; private String taskName;
/**
* 任务Id
*/
private Integer taskId;
/** /**
* 状态[1-每日任务|2-一次性任务] * 状态[1-每日任务|2-一次性任务]
*/ */
...@@ -29,7 +34,7 @@ public class StoneTaskVo implements Serializable,Cloneable { ...@@ -29,7 +34,7 @@ public class StoneTaskVo implements Serializable,Cloneable {
private Integer taskCount; private Integer taskCount;
/** /**
* 完成日期 2021-12-01 12:00:02 * 完成日期 2021-12-01
*/ */
private String taskTime; private String taskTime;
......
...@@ -43,7 +43,7 @@ public class StoneUserVo implements Serializable, Cloneable { ...@@ -43,7 +43,7 @@ public class StoneUserVo implements Serializable, Cloneable {
private List<StoneTaskVo> task; private List<StoneTaskVo> task;
public List<StoneTaskVo> getTask() { public List<StoneTaskVo> getTask() {
if(task==null){ if (task == null) {
return initTask(); return initTask();
} }
return task; return task;
...@@ -57,6 +57,7 @@ public class StoneUserVo implements Serializable, Cloneable { ...@@ -57,6 +57,7 @@ public class StoneUserVo implements Serializable, Cloneable {
for (int i = 0; i < taskName.length; i++) { for (int i = 0; i < taskName.length; i++) {
StoneTaskVo vo = StoneTaskVo.getNew(); StoneTaskVo vo = StoneTaskVo.getNew();
vo.setTaskName(taskName[i]); vo.setTaskName(taskName[i]);
vo.setTaskId(i);
if (i > 3) { if (i > 3) {
vo.setTaskType(2); vo.setTaskType(2);
} else { } else {
......
package com.liquidnet.service.stone.service.impl; package com.liquidnet.service.stone.service.impl;
import com.liquidnet.commons.lang.util.CurrentUtil; import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoSimpleVo; import com.liquidnet.service.adam.dto.vo.AdamUserInfoSimpleVo;
import com.liquidnet.service.stone.dto.StoneScoreListDto; import com.liquidnet.service.stone.dto.StoneScoreListDto;
import com.liquidnet.service.stone.service.IStoneScoreUserService; import com.liquidnet.service.stone.service.IStoneScoreUserService;
import com.liquidnet.service.stone.util.InnerUtils; import com.liquidnet.service.stone.util.InnerUtils;
import com.liquidnet.service.stone.util.StoneRedisUtils; import com.liquidnet.service.stone.util.StoneRedisUtils;
import com.liquidnet.service.stone.vo.StoneTaskVo;
import com.liquidnet.service.stone.vo.StoneUserVo; import com.liquidnet.service.stone.vo.StoneUserVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
...@@ -42,6 +45,14 @@ public class StoneScoreUserServiceImpl implements IStoneScoreUserService { ...@@ -42,6 +45,14 @@ public class StoneScoreUserServiceImpl implements IStoneScoreUserService {
vo.setScoreRest(BigDecimal.valueOf(rest)); vo.setScoreRest(BigDecimal.valueOf(rest));
vo.setScoreUse(BigDecimal.valueOf(use)); vo.setScoreUse(BigDecimal.valueOf(use));
vo.setStatus(userTaskVo.getStatus()); vo.setStatus(userTaskVo.getStatus());
vo.setSignIn(0);
for (StoneTaskVo taskVo : userTaskVo.getTask()) {
if (taskVo.getTaskId().equals(0)) {
if (taskVo.getTaskTime().equals(DateUtil.getNowTime(DateUtil.DATE_SMALL_STR))) {
vo.setSignIn(1);
}
}
}
return vo; return vo;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment