记得上下班打卡 | 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
e90c904b
Commit
e90c904b
authored
Aug 01, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refund test
parent
96eecd83
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
13 deletions
+15
-13
KylinOrderRefundsServiceImpl.java
...gzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
+14
-13
KylinRefundsStatusServiceImpl.java
...zai/kylin/service/impl/KylinRefundsStatusServiceImpl.java
+1
-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 @
e90c904b
...
@@ -285,9 +285,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
...
@@ -285,9 +285,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
break
;
break
;
case
"reject"
:
case
"reject"
:
boolean
cancelRes
=
kylinRefundsStatusServiceImpl
.
orderTicketRefundCancel
(
refundList
,
false
);
boolean
cancelRes
=
kylinRefundsStatusServiceImpl
.
orderTicketRefundCancel
(
refundList
,
false
);
if
(
cancelRes
)
{
log
.
info
(
"取消处理"
+
cancelRes
);
res
=
kylinRefundsStatusServiceImpl
.
orderRefundChangeStatus
(
refundList
,
type
,
reject
,
"
"
);
log
.
info
(
"取消处理ing
"
);
}
res
=
kylinRefundsStatusServiceImpl
.
orderRefundChangeStatus
(
refundList
,
type
,
reject
,
""
);
break
;
break
;
case
"unfilled"
:
case
"unfilled"
:
res
=
kylinRefundsStatusServiceImpl
.
orderTicketRefundUnfilled
(
refundList
,
refuse
);
res
=
kylinRefundsStatusServiceImpl
.
orderTicketRefundUnfilled
(
refundList
,
refuse
);
...
@@ -380,7 +380,8 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
...
@@ -380,7 +380,8 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
KylinOrderRefundPic
kylinOrderRefundPic
=
kylinOrderRefundPicMapper
.
selectOne
(
new
UpdateWrapper
<
KylinOrderRefundPic
>().
eq
(
"order_refunds_id"
,
orderRefundId
));
KylinOrderRefundPic
kylinOrderRefundPic
=
kylinOrderRefundPicMapper
.
selectOne
(
new
UpdateWrapper
<
KylinOrderRefundPic
>().
eq
(
"order_refunds_id"
,
orderRefundId
));
if
(
kylinOrderRefundPic
!=
null
)
{
if
(
kylinOrderRefundPic
!=
null
)
{
String
picStr
=
kylinOrderRefundPic
.
getPicUrl
();
String
picStr
=
kylinOrderRefundPic
.
getPicUrl
();
List
<
String
>
strList
=
JsonUtils
.
fromJson
(
picStr
,
new
TypeReference
<
List
<
String
>>()
{});
List
<
String
>
strList
=
JsonUtils
.
fromJson
(
picStr
,
new
TypeReference
<
List
<
String
>>()
{
});
kylinOrderRefundsVo
.
setPicList
(
strList
);
kylinOrderRefundsVo
.
setPicList
(
strList
);
}
}
...
@@ -473,20 +474,20 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
...
@@ -473,20 +474,20 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
}
}
@Override
@Override
public
String
getOrderRefundCode
(
String
code
,
int
type
)
{
public
String
getOrderRefundCode
(
String
code
,
int
type
)
{
String
orderCode
=
null
;
String
orderCode
=
null
;
if
(
type
==
1
)
{
if
(
type
==
1
)
{
KylinOrderRefunds
data
=
kylinOrderRefundsMapper
.
selectOne
(
new
UpdateWrapper
<
KylinOrderRefunds
>().
like
(
"order_refund_code"
,
code
));
KylinOrderRefunds
data
=
kylinOrderRefundsMapper
.
selectOne
(
new
UpdateWrapper
<
KylinOrderRefunds
>().
like
(
"order_refund_code"
,
code
));
if
(
data
==
null
)
{
if
(
data
==
null
)
{
return
null
;
return
null
;
}
else
{
}
else
{
orderCode
=
data
.
getOrderRefundCode
();
orderCode
=
data
.
getOrderRefundCode
();
}
}
}
else
if
(
type
==
2
)
{
}
else
if
(
type
==
2
)
{
KylinOrderTickets
data
=
kylinOrderTicketsMapper
.
selectOne
(
new
UpdateWrapper
<
KylinOrderTickets
>().
like
(
"order_code"
,
code
));
KylinOrderTickets
data
=
kylinOrderTicketsMapper
.
selectOne
(
new
UpdateWrapper
<
KylinOrderTickets
>().
like
(
"order_code"
,
code
));
if
(
data
==
null
)
{
if
(
data
==
null
)
{
return
null
;
return
null
;
}
else
{
}
else
{
orderCode
=
data
.
getOrderCode
();
orderCode
=
data
.
getOrderCode
();
}
}
}
}
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java
View file @
e90c904b
...
@@ -334,6 +334,7 @@ public class KylinRefundsStatusServiceImpl {
...
@@ -334,6 +334,7 @@ public class KylinRefundsStatusServiceImpl {
}
}
public
boolean
orderRefundChangeStatus
(
List
<
KylinOrderRefunds
>
refundList
,
String
type
,
String
reject
,
String
refuse
)
{
public
boolean
orderRefundChangeStatus
(
List
<
KylinOrderRefunds
>
refundList
,
String
type
,
String
reject
,
String
refuse
)
{
log
.
info
(
"orderRefundChangeStatus ----- in"
);
String
authId
=
ShiroUtils
.
getUserId
().
toString
();
String
authId
=
ShiroUtils
.
getUserId
().
toString
();
String
authName
=
ShiroUtils
.
getLoginName
();
String
authName
=
ShiroUtils
.
getLoginName
();
KylinOrderRefunds
kylinOrderRefunds
=
new
KylinOrderRefunds
();
KylinOrderRefunds
kylinOrderRefunds
=
new
KylinOrderRefunds
();
...
...
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