记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
b85522bc
Commit
b85522bc
authored
Sep 27, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
下单 错误日志修改
parent
1689fae8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
11 deletions
+14
-11
liquidnet-service-order-dev.yml
...s-config/liquidnet-config/liquidnet-service-order-dev.yml
+2
-2
liquidnet-service-platform-dev.yml
...onfig/liquidnet-config/liquidnet-service-platform-dev.yml
+2
-2
KylinOrderTicketsServiceImpl.java
...vice/order/service/impl/KylinOrderTicketsServiceImpl.java
+10
-7
No files found.
liquidnet-bus-config/liquidnet-config/liquidnet-service-order-dev.yml
View file @
b85522bc
...
@@ -16,10 +16,10 @@ liquidnet:
...
@@ -16,10 +16,10 @@ liquidnet:
pattern-rolling-file-name
:
${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
pattern-rolling-file-name
:
${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
level
:
debug
level
:
debug
mysql
:
mysql
:
database-name
:
dev
_ln_scene
database-name
:
prod
_ln_scene
mongodb
:
mongodb
:
sslEnabled
:
false
sslEnabled
:
false
database
:
dev
_ln_scene
database
:
prod
_ln_scene
url-pay
:
url-pay
:
pay
:
${liquidnet.service.order.url-pay.pay}
pay
:
${liquidnet.service.order.url-pay.pay}
check
:
${liquidnet.service.order.url-pay.check}
check
:
${liquidnet.service.order.url-pay.check}
...
...
liquidnet-bus-config/liquidnet-config/liquidnet-service-platform-dev.yml
View file @
b85522bc
...
@@ -15,10 +15,10 @@ liquidnet:
...
@@ -15,10 +15,10 @@ liquidnet:
rabbitmq
:
rabbitmq
:
connection-timeout
:
5000
connection-timeout
:
5000
mysql
:
mysql
:
database-name
:
dev
_ln_scene
database-name
:
prod
_ln_scene
mongodb
:
mongodb
:
sslEnabled
:
false
sslEnabled
:
false
database
:
dev
_ln_scene
database
:
prod
_ln_scene
al-oss
:
al-oss
:
imgUrl
:
"
https://img.zhengzai.tv/"
imgUrl
:
"
https://img.zhengzai.tv/"
appUrl
:
"
https://app.zhengzai.tv/"
appUrl
:
"
https://app.zhengzai.tv/"
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @
b85522bc
...
@@ -120,6 +120,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
...
@@ -120,6 +120,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
}
}
}
}
if
(
performanceData
==
null
||
ticketTimesData
==
null
||
ticketData
==
null
)
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20004"
));
//参数错误
}
if
(
payOrderParam
.
getIsExpress
().
equals
(
1
)
&&
ticketData
.
getIsExpress
().
equals
(
0
))
{
if
(
payOrderParam
.
getIsExpress
().
equals
(
1
)
&&
ticketData
.
getIsExpress
().
equals
(
0
))
{
return
ResponseDto
.
failure
(
"票种类型错误"
);
//参数错误
return
ResponseDto
.
failure
(
"票种类型错误"
);
//参数错误
}
else
if
(
payOrderParam
.
getIsElectronic
().
equals
(
1
)
&&
ticketData
.
getIsElectronic
().
equals
(
0
))
{
}
else
if
(
payOrderParam
.
getIsElectronic
().
equals
(
1
)
&&
ticketData
.
getIsElectronic
().
equals
(
0
))
{
...
@@ -128,10 +132,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
...
@@ -128,10 +132,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
return
ResponseDto
.
failure
(
"票种类型错误"
);
//参数错误
return
ResponseDto
.
failure
(
"票种类型错误"
);
//参数错误
}
}
if
(
performanceData
==
null
||
ticketTimesData
==
null
||
ticketData
==
null
)
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20004"
));
//参数错误
}
if
(!
ticketData
.
getTimeId
().
equals
(
payOrderParam
.
getTimeId
())
||
!
ticketTimesData
.
getPerformanceId
().
equals
(
payOrderParam
.
getPerformanceId
()))
{
if
(!
ticketData
.
getTimeId
().
equals
(
payOrderParam
.
getTimeId
())
||
!
ticketTimesData
.
getPerformanceId
().
equals
(
payOrderParam
.
getPerformanceId
()))
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20004"
));
//参数错误
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20004"
));
//参数错误
}
}
...
@@ -307,7 +307,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
...
@@ -307,7 +307,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
return
resultData
;
return
resultData
;
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"Kylin Order Pay Error = "
,
e
);
log
.
error
(
"Kylin Order Pay Error =
{}
"
,
e
);
if
(
isDownGeneral
)
{
if
(
isDownGeneral
)
{
orderUtils
.
changeSurplus
(
isPay
,
payOrderParam
.
getTicketId
(),
payOrderParam
.
getNumber
());
orderUtils
.
changeSurplus
(
isPay
,
payOrderParam
.
getTicketId
(),
payOrderParam
.
getNumber
());
for
(
AdamEntersVo
enters
:
entersVoList
)
{
for
(
AdamEntersVo
enters
:
entersVoList
)
{
...
@@ -319,10 +319,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
...
@@ -319,10 +319,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
}
}
}
}
}
}
if
(
e
.
getMessage
().
equals
(
"券不可用"
))
{
if
(
e
.
getMessage
()==
null
){
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20018"
));
//乱七八糟异常
}
else
if
(
e
.
getMessage
().
equals
(
"券不可用"
))
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20030"
));
//券不可用
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20030"
));
//券不可用
}
else
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20018"
));
//乱七八糟异常
}
}
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20018"
));
//乱七八糟异常
}
}
}
}
...
...
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