记得上下班打卡 | 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
041d4829
Commit
041d4829
authored
Jan 06, 2022
by
jiangxiulong
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant
parents
d8f8481b
86e7249a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
KylinRefundsStatusServiceImpl.java
...zai/kylin/service/impl/KylinRefundsStatusServiceImpl.java
+1
-2
OrderRefundOvertimeServiceImpl.java
...ce/order/service/impl/OrderRefundOvertimeServiceImpl.java
+3
-4
No files found.
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 @
041d4829
...
@@ -480,11 +480,10 @@ public class KylinRefundsStatusServiceImpl {
...
@@ -480,11 +480,10 @@ public class KylinRefundsStatusServiceImpl {
continue
;
continue
;
}
else
{
}
else
{
// 同步大麦
退款
// 同步大麦
票务平台
KylinOrderTicketVo
orderData
=
dataUtils
.
getOrderTicketVo
(
refund
.
getOrderTicketsId
());
KylinOrderTicketVo
orderData
=
dataUtils
.
getOrderTicketVo
(
refund
.
getOrderTicketsId
());
KylinPerformanceVo
vo
=
dataUtils
.
getPerformanceVo
(
orderData
.
getPerformanceId
());
KylinPerformanceVo
vo
=
dataUtils
.
getPerformanceVo
(
orderData
.
getPerformanceId
());
taobaoTicketUtils
.
refundDamaiOrder
(
orderData
,
vo
);
taobaoTicketUtils
.
refundDamaiOrder
(
orderData
,
vo
);
// TODO: 2021/12/21 jxl 同步票务平台
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
info
(
"退款请求pay失败e"
+
e
.
getMessage
());
log
.
info
(
"退款请求pay失败e"
+
e
.
getMessage
());
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/OrderRefundOvertimeServiceImpl.java
View file @
041d4829
...
@@ -72,11 +72,10 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
...
@@ -72,11 +72,10 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
);
);
if
(
res
)
{
if
(
res
)
{
// 优惠券 库存 积分 大美已自己处理
// 优惠券 库存 积分 大美已自己处理
// 同步大麦
退款
// 同步大麦
票务平台
KylinOrderTicketVo
orderData
=
dataUtils
.
getOrderTicketVo
(
orderTicketsId
);
/*
KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(orderTicketsId);
KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId());
KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId());
taobaoTicketUtils
.
refundDamaiOrder
(
orderData
,
vo
);
taobaoTicketUtils.refundDamaiOrder(orderData, vo);*/
// TODO: 2021/12/21 jxl 同步票务平台
return
true
;
return
true
;
}
else
{
}
else
{
return
false
;
return
false
;
...
...
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