|
|
@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
+import com.cyksj.common.constant.Constant;
|
|
|
import com.cyksj.common.constant.PointsRecordConst;
|
|
|
import com.cyksj.common.constant.TaskTypeEnum;
|
|
|
import com.cyksj.common.exception.BusinessRuntimeException;
|
|
|
@@ -297,13 +298,13 @@ public class MarketFrontServiceImpl implements MarketFrontService {
|
|
|
public void signCheck(SignUser signUser) {
|
|
|
//更新时间是否小于今日零时且是否为连签
|
|
|
Date updateTime = signUser.getUpdateTime();
|
|
|
- DateTime signZero = DateUtil.beginOfDay(DateTime.now());
|
|
|
+ DateTime signZero = DateUtil.beginOfDay(updateTime);
|
|
|
DateTime thisZero = DateUtil.beginOfDay(DateTime.now());
|
|
|
- if (updateTime.after(thisZero)) {
|
|
|
+ if (updateTime.getTime() >= thisZero.getTime()) {
|
|
|
signUser.setIsHadChecked(false);
|
|
|
// throw BusinessRuntimeException.getInstance("您已签到");
|
|
|
} else {
|
|
|
- if (updateTime.before(thisZero) && thisZero.getTime() - signZero.getTime() == 0) {
|
|
|
+ if (updateTime.before(thisZero) && thisZero.getTime() - signZero.getTime() == Constant.DAY_MILLS) {
|
|
|
log.info("用户:{}连续签到,此时天数为:{}", signUser.getUserId(), signUser.getDayPeriod());
|
|
|
signUser.setDay(signUser.getDay() + 1);
|
|
|
if (signUser.getDayPeriod() == 7) {
|