Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OTWebSocketHub
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李福茂
OTWebSocketHub
Commits
2fc4bbf5
Commit
2fc4bbf5
authored
May 24, 2021
by
Maodashu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复持久化逻辑bug
parent
1e289a96
Pipeline
#204
canceled with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
OrderTracer.cs
OTWebSocket.API/Services/OrderTracer.cs
+2
-2
WebSocketService.cs
OTWebSocket.API/Services/WebSocketService.cs
+10
-10
No files found.
OTWebSocket.API/Services/OrderTracer.cs
View file @
2fc4bbf5
...
@@ -237,7 +237,7 @@ namespace OTWebSocket.API.Services
...
@@ -237,7 +237,7 @@ namespace OTWebSocket.API.Services
await
_redisService
.
ReleaseOrder
(
order
.
OrderId
);
await
_redisService
.
ReleaseOrder
(
order
.
OrderId
);
if
(
needPersist
)
if
(
needPersist
)
{
{
await
_
mongoDBService
.
UpdateOTOrderAsync
(
cacheOrder
);
await
_
apiService
.
UpdateMongoOrder
(
cacheOrder
);
_logger
.
Debug
(
$"[订单同步] 执行缓存数据持久化完毕
{
JObject
.
FromObject
(
cacheOrder
)}
"
);
_logger
.
Debug
(
$"[订单同步] 执行缓存数据持久化完毕
{
JObject
.
FromObject
(
cacheOrder
)}
"
);
}
}
if
(
needReport
)
if
(
needReport
)
...
@@ -268,7 +268,7 @@ namespace OTWebSocket.API.Services
...
@@ -268,7 +268,7 @@ namespace OTWebSocket.API.Services
await
_redisService
.
RemoveLiveOrder
(
cacheOrder
.
OrderId
);
//删除缓冲
await
_redisService
.
RemoveLiveOrder
(
cacheOrder
.
OrderId
);
//删除缓冲
await
_redisService
.
ReleaseOrder
(
order
.
OrderId
);
//释放锁
await
_redisService
.
ReleaseOrder
(
order
.
OrderId
);
//释放锁
await
_mongoDBService
.
DeleteOrderRecordAsync
(
cacheOrder
.
OrderId
);
//删除MongoDB待查订单列表
await
_mongoDBService
.
DeleteOrderRecordAsync
(
cacheOrder
.
OrderId
);
//删除MongoDB待查订单列表
await
_
mongoDBService
.
UpdateOTOrderAsync
(
cacheOrder
);
//持久化更新
await
_
apiService
.
UpdateMongoOrder
(
cacheOrder
);
count
++;
count
++;
}
}
}
}
...
...
OTWebSocket.API/Services/WebSocketService.cs
View file @
2fc4bbf5
...
@@ -181,16 +181,16 @@ namespace OTWebSocket.API.Services
...
@@ -181,16 +181,16 @@ namespace OTWebSocket.API.Services
_redisService
.
SetLiveOrder
(
liveOrder
);
_redisService
.
SetLiveOrder
(
liveOrder
);
_redisService
.
ReleaseOrder
(
orderId
);
_redisService
.
ReleaseOrder
(
orderId
);
if
(
liveOrder
.
IsFinished
())
//
if (liveOrder.IsFinished())
{
//
{
_logger
.
Debug
(
$"持久化更新redis缓存
{
JObject
.
FromObject
(
liveOrder
)}
"
);
//
_logger.Debug($"持久化更新redis缓存{JObject.FromObject(liveOrder)}");
liveOrder
=
_redisService
.
LockGetOrder
(
orderId
).
Result
;
//
liveOrder = _redisService.LockGetOrder(orderId).Result;
liveOrder
.
Comment
=
"持久化"
;
//
liveOrder.Comment = "持久化";
_redisService
.
SetLiveOrder
(
liveOrder
);
//
_redisService.SetLiveOrder(liveOrder);
_redisService
.
ReleaseOrder
(
orderId
);
//
_redisService.ReleaseOrder(orderId);
_redisService
.
RemoveLiveOrder
(
liveOrder
.
OrderId
);
//
_redisService.RemoveLiveOrder(liveOrder.OrderId);
_apiService
.
UpdateMongoOrder
(
liveOrder
);
//
_apiService.UpdateMongoOrder(liveOrder);
}
//
}
}
}
catch
(
Exception
e
)
catch
(
Exception
e
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment