记得上下班打卡 | 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
b4b6fcf7
Commit
b4b6fcf7
authored
Aug 01, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 同步大麦
parent
db1d52df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
KylinDamaiServiceImpl.java
...in/zhengzai/kylin/service/impl/KylinDamaiServiceImpl.java
+8
-1
KylinOrderTicketsServiceImpl.java
...vice/order/service/impl/KylinOrderTicketsServiceImpl.java
+8
-1
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinDamaiServiceImpl.java
View file @
b4b6fcf7
...
@@ -225,6 +225,13 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
...
@@ -225,6 +225,13 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
}
}
}
}
long
orderIdKey
;
if
(
item
.
getOrderTicketsId
().
length
()
>
13
)
{
orderIdKey
=
Long
.
valueOf
(
item
.
getOrderTicketsId
().
substring
(
0
,
5
).
concat
(
item
.
getOrderTicketsId
().
substring
(
7
,
12
)));
}
else
{
orderIdKey
=
Long
.
valueOf
(
item
.
getOrderTicketsId
());
}
if
(
item
.
getStatus
()
==
4
)
{
if
(
item
.
getStatus
()
==
4
)
{
taobaoTicketUtils
.
withdrawDamaiOrder
(
timemId
,
orderTicketEntitiesKey
);
taobaoTicketUtils
.
withdrawDamaiOrder
(
timemId
,
orderTicketEntitiesKey
);
...
@@ -239,7 +246,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
...
@@ -239,7 +246,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
obj3
.
setPerformId
(
timemId
);
//场次id
obj3
.
setPerformId
(
timemId
);
//场次id
obj3
.
setTicketItemId
(
ticketsmId
);
obj3
.
setTicketItemId
(
ticketsmId
);
obj3
.
setVoucherId
(
orderTicketEntitiesKey
);
//票单号 入场人id
obj3
.
setVoucherId
(
orderTicketEntitiesKey
);
//票单号 入场人id
obj3
.
setOrderId
(
Long
.
parseLong
(
item
.
getOrderTicketsId
())
);
//订单id orderId
obj3
.
setOrderId
(
orderIdKey
);
//订单id orderId
obj3
.
setMediumType
(
item
.
getGetTicketType
().
equals
(
"express"
)
?
1L
:
2L
);
//票类型 快递 电子
obj3
.
setMediumType
(
item
.
getGetTicketType
().
equals
(
"express"
)
?
1L
:
2L
);
//票类型 快递 电子
obj3
.
setSupplierSecret
(
taobaoTicketUtils
.
getSupplierSecret
());
obj3
.
setSupplierSecret
(
taobaoTicketUtils
.
getSupplierSecret
());
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @
b4b6fcf7
...
@@ -937,6 +937,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
...
@@ -937,6 +937,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
ticketIdKey
=
Long
.
valueOf
(
item
.
getTicketId
());
ticketIdKey
=
Long
.
valueOf
(
item
.
getTicketId
());
}
}
long
orderIdKey
;
if
(
orderData
.
getOrderTicketsId
().
length
()
>
13
)
{
orderIdKey
=
Long
.
valueOf
(
orderData
.
getOrderTicketsId
().
substring
(
0
,
5
).
concat
(
orderData
.
getOrderTicketsId
().
substring
(
7
,
12
)));
}
else
{
orderIdKey
=
Long
.
valueOf
(
orderData
.
getOrderTicketsId
());
}
long
orderTicketEntitiesKey
;
long
orderTicketEntitiesKey
;
if
(
isMember
==
1
)
{
if
(
isMember
==
1
)
{
if
(
item
.
getOrderTicketEntitiesId
().
length
()
>
13
)
{
if
(
item
.
getOrderTicketEntitiesId
().
length
()
>
13
)
{
...
@@ -956,7 +963,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
...
@@ -956,7 +963,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
obj3
.
setTicketItemId
(
ticketIdKey
);
obj3
.
setTicketItemId
(
ticketIdKey
);
obj3
.
setVoucherId
(
orderTicketEntitiesKey
);
//票单号 入场人id
obj3
.
setVoucherId
(
orderTicketEntitiesKey
);
//票单号 入场人id
obj3
.
setOrderId
(
Long
.
parseLong
(
orderData
.
getOrderTicketsId
())
);
//订单id orderId
obj3
.
setOrderId
(
orderIdKey
);
//订单id orderId
obj3
.
setMediumType
(
orderData
.
getGetTicketType
().
equals
(
"express"
)
?
1L
:
2L
);
//票类型 快递 电子
obj3
.
setMediumType
(
orderData
.
getGetTicketType
().
equals
(
"express"
)
?
1L
:
2L
);
//票类型 快递 电子
obj3
.
setSupplierSecret
(
taobaoTicketUtils
.
getSupplierSecret
());
obj3
.
setSupplierSecret
(
taobaoTicketUtils
.
getSupplierSecret
());
obj3
.
setSystemId
(
taobaoTicketUtils
.
getSystemId
());
obj3
.
setSystemId
(
taobaoTicketUtils
.
getSystemId
());
...
...
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