记得上下班打卡 | 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
3777fd58
Commit
3777fd58
authored
Jul 27, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opt;
parent
2e4c2a89
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
AdamMemberOrderServiceImpl.java
...service/adam/service/impl/AdamMemberOrderServiceImpl.java
+2
-4
KylinOrderTicketsServiceImpl.java
...vice/order/service/impl/KylinOrderTicketsServiceImpl.java
+3
-2
No files found.
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @
3777fd58
...
...
@@ -132,8 +132,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
memberOrderVo
.
setUid
(
CurrentUtil
.
getCurrentUid
());
memberOrderVo
.
setPrice
(
param
.
getPrice
());
memberOrderVo
.
setClientIp
(
clientIp
);
String
headerCliVersion
=
CurrentUtil
.
getHeaderCliVersion
();
String
headerCliSource
=
CurrentUtil
.
getHeaderCliSource
();
String
headerCliVersion
=
CurrentUtil
.
getHeaderCliVersion
(),
headerCliSource
=
CurrentUtil
.
getHeaderCliSource
();
memberOrderVo
.
setSource
(
null
==
headerCliSource
?
""
:
headerCliSource
);
memberOrderVo
.
setVersion
(
null
==
headerCliVersion
?
""
:
headerCliVersion
);
...
...
@@ -349,8 +348,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
initMemberOrderVo
.
setPaymentAt
(
now
);
initMemberOrderVo
.
setCreatedAt
(
now
);
initMemberOrderVo
.
setClientIp
(
CurrentUtil
.
getCliIpAddr
());
String
headerCliVersion
=
CurrentUtil
.
getHeaderCliVersion
();
String
headerCliSource
=
CurrentUtil
.
getHeaderCliSource
();
String
headerCliVersion
=
CurrentUtil
.
getHeaderCliVersion
(),
headerCliSource
=
CurrentUtil
.
getHeaderCliSource
();
initMemberOrderVo
.
setSource
(
null
==
headerCliSource
?
""
:
headerCliSource
);
initMemberOrderVo
.
setVersion
(
null
==
headerCliVersion
?
""
:
headerCliVersion
);
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @
3777fd58
...
...
@@ -328,8 +328,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
private
ResponseDto
<
PayInnerResultVo
>
order
(
PayOrderParam
payOrderParam
,
String
uid
,
boolean
isMember
,
int
isTrueName
,
KylinPerformanceVo
performanceData
,
KylinTicketVo
ticketData
,
List
<
AdamEntersVo
>
entersVoList
,
Integer
isStudent
,
KylinTicketTimesVo
ticketTimesData
,
Long
currentTime
)
{
LinkedList
<
String
>
sqls
=
ObjectUtil
.
cloneLinkedListStr
();
String
source
=
CurrentUtil
.
getHeaderCliSource
()
==
null
?
""
:
CurrentUtil
.
getHeaderCliSource
();
String
version
=
CurrentUtil
.
getHeaderCliVersion
()
==
null
?
""
:
CurrentUtil
.
getHeaderCliVersion
();
String
headerCliSource
=
CurrentUtil
.
getHeaderCliSource
(),
headerCliVersion
=
CurrentUtil
.
getHeaderCliVersion
();
String
source
=
headerCliSource
==
null
?
""
:
headerCliSource
;
String
version
=
headerCliVersion
==
null
?
""
:
headerCliVersion
;
LocalDateTime
now
=
LocalDateTime
.
now
();
//生成订单 order_ticket
KylinOrderTickets
orderTickets
=
KylinOrderTickets
.
getNew
();
...
...
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