记得上下班打卡 | 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
37652730
Commit
37652730
authored
Jun 30, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 ErrorMapping Code
parent
48914585
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
14 deletions
+25
-14
KylinOrderRefundsServiceImpl.java
...gzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
+2
-1
KylinOrderTicketsController.java
...service/kylin/controller/KylinOrderTicketsController.java
+1
-1
KylinOrderTicketsServiceImpl.java
...vice/kylin/service/impl/KylinOrderTicketsServiceImpl.java
+12
-12
errors.properties
...t-service-kylin-impl/src/main/resources/errors.properties
+10
-0
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
View file @
37652730
...
...
@@ -10,6 +10,7 @@ import com.liquidnet.client.admin.common.utils.DateUtils;
import
com.liquidnet.client.admin.common.utils.ShiroUtils
;
import
com.liquidnet.commons.lang.util.BeanUtil
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.service.base.ErrorMapping
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.kylin.constant.KylinTableStatusConst
;
import
com.liquidnet.service.kylin.dao.KylinOrderRefundsEntitiesDao
;
...
...
@@ -154,7 +155,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
for
(
int
i
=
0
;
i
<=
ticketEntityIds
.
size
()
-
1
;
i
++)
{
Double
price
=
entitiesPrice
.
get
(
i
);
if
(
price
<
0
)
{
return
ResponseDto
.
failure
(
"退款金额不能为0"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20021"
)
);
}
else
{
Double
refundedPrice
=
kylinOrderTicketEntitiesMapper
.
getRefundEntitiesPrice
(
//已退
orderTicketsId
,
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java
View file @
37652730
...
...
@@ -53,7 +53,7 @@ public class KylinOrderTicketsController {
public
ResponseDto
<
PayResultVo
>
payAgain
(
@RequestBody
@Valid
PayAgainParam
payAgainParam
)
{
PayResultVo
vo
=
orderTicketsService
.
payAgain
(
payAgainParam
).
getData
();
if
(
null
==
vo
)
{
return
ResponseDto
.
failure
(
"订单已失效"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20024"
)
);
}
else
{
return
ResponseDto
.
success
(
vo
);
}
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @
37652730
...
...
@@ -116,7 +116,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
String
uid
=
CurrentUtil
.
getCurrentUid
();
String
lock
=
"userId:"
+
uid
;
if
(!
redisLockUtil
.
tryLock
(
lock
,
1
,
5
))
{
return
ResponseDto
.
failure
(
"请求频繁"
);
//参数错误
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20023"
)
);
//参数错误
}
try
{
currentTime
=
System
.
currentTimeMillis
();
...
...
@@ -642,25 +642,25 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
return
null
;
}
if
(
orderTicketData
==
null
)
{
return
ResponseDto
.
failure
(
"订单不存在"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20024"
)
);
}
if
(
orderTicketData
.
getStatus
()
==
KylinTableStatusConst
.
ORDER_STATUS1
)
{
return
ResponseDto
.
failure
(
"订单已支付"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20025"
)
);
}
else
{
if
(
orderTicketData
.
getStatus
()
!=
KylinTableStatusConst
.
ORDER_STATUS0
)
{
return
ResponseDto
.
failure
(
"订单已关闭"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20026"
)
);
}
}
String
returnCheckData
=
HttpUtil
.
get
(
checkUrl
+
"?code="
+
orderTicketData
.
getPayCode
(),
null
);
PayResultVo
checkVo
=
JsonUtils
.
fromJson
(
returnCheckData
,
PayResultVo
.
class
);
if
(
checkVo
.
getStatus
()
==
1
)
{
return
ResponseDto
.
failure
(
"'您已支付请刷新再试'"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20027"
)
);
}
if
(!
orderTicketData
.
getPayType
().
equals
(
"no"
))
{
if
(
orderTicketData
.
getEntitiesVoList
().
size
()
==
0
)
{
return
ResponseDto
.
failure
(
"参数错误"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20004"
)
);
}
KylinOrderTicketEntitiesVo
entitiesData
=
orderTicketData
.
getEntitiesVoList
().
get
(
0
);
...
...
@@ -734,10 +734,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
log
.
info
(
UserPathDto
.
setData
(
"再次支付"
,
payAgainParam
,
payResultVo
));
return
ResponseDto
.
success
(
payResultVo
);
}
return
ResponseDto
.
failure
(
"未选择支付方式"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20029"
)
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
ResponseDto
.
failure
(
"订单已失效"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20028"
)
);
}
}
...
...
@@ -1078,7 +1078,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
return
null
;
}
if
(
orderTicketData
==
null
)
{
return
ResponseDto
.
failure
(
"订单不存在"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20024"
)
);
}
else
{
String
returnCheckData
=
HttpUtil
.
get
(
checkUrl
+
"?code="
+
orderTicketData
.
getPayCode
(),
null
);
PayResultVo
checkVo
=
JsonUtils
.
fromJson
(
returnCheckData
,
PayResultVo
.
class
);
...
...
@@ -1194,7 +1194,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
BigDecimal
refundSinglePrice
=
dataUtils
.
getCanRefundOrderEntitiesPrice
(
orderTicketVo
,
kylinOrderRefundsVoBaseList
,
orderTicketEntitiesId
);
if
(
refundSinglePrice
.
doubleValue
()<=
0
){
return
ResponseDto
.
failure
(
"申请金额不得小于0"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20022"
)
);
}
Map
token
=
CurrentUtil
.
getTokenClaims
();
String
username
=
StringUtils
.
defaultString
(((
String
)
token
.
get
(
"nickname"
)),
""
);
...
...
@@ -1223,7 +1223,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
try
{
KylinOrderRefundsVoBase
orderRefundsVo
=
dataUtils
.
getOrderRefundVo
(
orderRefundsId
);
if
(!
orderRefundsVo
.
getStatus
().
equals
(
0
)){
return
ResponseDto
.
failure
(
"当前状态不可撤回"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20020"
)
);
}
List
<
KylinOrderRefundEntitiesVo
>
refundEntities
=
orderRefundsVo
.
getOrderRefundEntitiesVoList
();
String
orderTicketsId
=
orderRefundsVo
.
getOrderTicketsId
();
...
...
@@ -1354,7 +1354,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
return
ResponseDto
.
success
(
true
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
ResponseDto
.
failure
(
"当前状态不可撤回"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20020"
)
);
}
}
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/errors.properties
View file @
37652730
...
...
@@ -23,6 +23,16 @@
20017
=
年龄不符合
20018
=
下单失败
20019
=
申请失败
20020
=
当前状态不可撤回
20021
=
退款金额不能为0
20022
=
申请金额不得小于0
20023
=
请求频繁
20024
=
订单不存在
20025
=
订单已支付
20026
=
订单已关闭
20028
=
订单已失效
20027
=
您已支付请刷新再试
20029
=
未选择支付方式
#APP PARTNER
20101
=
添加失败
...
...
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