Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
97e7a880
Commit
97e7a880
authored
Mar 15, 2021
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/20210306-蜜雪订单sessionId错误修改-张志恒'
parents
95b0fb32
243f3190
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
+3
-2
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
View file @
97e7a880
...
...
@@ -256,9 +256,10 @@ public class AppOrderServiceImpl implements AppOrderService {
if
(!
PayStatus
.
NOT_PAY
.
getCode
().
equals
(
orderBean
.
getPayStatus
())
||
!
OrderStatus
.
WAIT_PAY
.
getCode
().
equals
(
orderBean
.
getStatus
()))
{
throw
new
ServiceException
(
ResponseResult
.
ORDER_STATUS_PRE_PAYMENT_NOT_SUPPORT
);
}
//蜜雪sessionId不一致的跳过验证
OrderExtInfoDto
extInfo
=
JSONObject
.
parseObject
(
orderBean
.
getExtInfo
(),
OrderExtInfoDto
.
class
);
if
(
extInfo
==
null
||
StringUtils
.
isBlank
(
extInfo
.
getSessionId
())
||
!
extInfo
.
getSessionId
().
equals
(
createPrepayVo
.
getSessionId
()))
{
// if (extInfo == null || StringUtils.isBlank(extInfo.getSessionId()) || !extInfo.getSessionId().equals(createPrepayVo.getSessionId())) {
if
(
extInfo
==
null
||
StringUtils
.
isBlank
(
extInfo
.
getSessionId
()))
{
throw
new
ServiceException
(
ResponseResult
.
ORDER_OWNER_ERROR
);
}
}
...
...
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