From a0684138890219d59d8f394fd4808b321fae6f4b Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 08 十一月 2023 12:03:37 +0800
Subject: [PATCH] # 实时车位信息
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 2 +-
server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 2 +-
server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java | 4 +---
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java b/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java
index f03bd38..3ebb2e1 100644
--- a/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java
+++ b/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java
@@ -34,14 +34,12 @@
if(user !=null){
signString.append("loginuserId").append("=").append(user.getId()).append(";");
}
-<<<<<<< HEAD
-=======
String apiToken = String.valueOf(request.getHeader("token"));
if(StringUtils.isNotBlank(apiToken)){
signString.append("apiToken").append("=").append(apiToken).append(";");
}
->>>>>>> 7f2749f8bb57290104636f50de4824ad1f13cdd5
+
// 鍙傛暟绛惧悕
return DigestUtils.md5DigestAsHex(signString.toString().getBytes());
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index 081c45e..31bab54 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -649,7 +649,7 @@
memberRides.forEach(s->{
Integer between = DateUtil.between(s.getCreateDate(), new Date());
// 澶т簬闃堝��
- if (between > 2){
+ if (between >= 2){
s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
s.setEditDate(new Date());
memberRidesMapper.updateById(s);
diff --git a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
index 550897a..957bc40 100644
--- a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
@@ -1,6 +1,6 @@
package com.doumee.api.web;
-import com.doumee.api.Repeat.RepeatSubmit;
+//import com.doumee.api.Repeat.RepeatSubmit;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.pr.PreventRepeat;
--
Gitblit v1.9.3