记得上下班打卡 | 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
85d38644
Commit
85d38644
authored
Jun 21, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
下单 写死参数
parent
2c61def7
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
129 additions
and
147 deletions
+129
-147
IKylinOrderTicketsService.java
...dnet/service/kylin/service/IKylinOrderTicketsService.java
+1
-1
KylinOrderTicketsController.java
...service/kylin/controller/KylinOrderTicketsController.java
+2
-3
KylinOrderTicketsServiceImpl.java
...vice/kylin/service/impl/KylinOrderTicketsServiceImpl.java
+116
-142
KylinTicketsPartnerServiceImpl.java
.../service/impl/partner/KylinTicketsPartnerServiceImpl.java
+10
-1
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java
View file @
85d38644
...
@@ -35,7 +35,7 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
...
@@ -35,7 +35,7 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
// 同步大麦数据接口
// 同步大麦数据接口
//订单列表(状态 待支付 已支付 倒计时 已失效)
//订单列表(状态 待支付 已支付 倒计时 已失效)
PageInfo
<
List
<
KylinOrderListVo
>>
orderList
(
int
page
,
int
size
);
PageInfo
<
List
<
KylinOrderListVo
>>
orderList
();
//订单详情
//订单详情
OrderDetailsVo
orderDetails
(
String
orderId
);
OrderDetailsVo
orderDetails
(
String
orderId
);
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java
View file @
85d38644
...
@@ -71,9 +71,8 @@ public class KylinOrderTicketsController {
...
@@ -71,9 +71,8 @@ public class KylinOrderTicketsController {
@GetMapping
(
"list"
)
@GetMapping
(
"list"
)
@ApiOperation
(
"订单列表"
)
@ApiOperation
(
"订单列表"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PageInfo
<
List
<
KylinOrderListVo
>>>
orderList
(
@RequestParam
(
"page"
)
int
page
,
public
ResponseDto
<
PageInfo
<
List
<
KylinOrderListVo
>>>
orderList
()
{
@RequestParam
(
"size"
)
int
size
)
{
return
ResponseDto
.
success
(
orderTicketsService
.
orderList
());
return
ResponseDto
.
success
(
orderTicketsService
.
orderList
(
page
,
size
));
}
}
@GetMapping
(
"details"
)
@GetMapping
(
"details"
)
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @
85d38644
This diff is collapsed.
Click to expand it.
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @
85d38644
...
@@ -118,9 +118,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
...
@@ -118,9 +118,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo
.
setDefault
();
kylinTicketPartnerVo
.
setDefault
();
if
(
ticketCreateParam
.
getIsExpress
()==
1
){
if
(
ticketCreateParam
.
getIsExpress
()==
1
){
kylinTicketPartnerVo
.
setDescribesExpress
(
ticketCreateParam
.
getDescribesExpress
());
kylinTicketPartnerVo
.
setDescribesExpress
(
ticketCreateParam
.
getDescribesExpress
());
}
else
{
kylinTicketPartnerVo
.
setDescribesExpress
(
""
);
}
}
if
(
ticketCreateParam
.
getIsElectronic
()==
1
){
if
(
ticketCreateParam
.
getIsElectronic
()==
1
){
kylinTicketPartnerVo
.
setDescribeElectronic
(
ticketCreateParam
.
getDescribeElectronic
());
kylinTicketPartnerVo
.
setDescribeElectronic
(
ticketCreateParam
.
getDescribeElectronic
());
}
else
{
kylinTicketPartnerVo
.
setDescribeElectronic
(
""
);
}
}
if
(
ticketCreateParam
.
getIsExpress
()
==
1
)
{
if
(
ticketCreateParam
.
getIsExpress
()
==
1
)
{
...
@@ -164,10 +168,15 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
...
@@ -164,10 +168,15 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo
.
setType
(
kylinTicketTimesPartnerVo
.
getType
());
kylinTicketPartnerVo
.
setType
(
kylinTicketTimesPartnerVo
.
getType
());
if
(
ticketCreateParam
.
getIsExpress
()==
1
){
if
(
ticketCreateParam
.
getIsExpress
()==
1
){
kylinTicketPartnerVo
.
setDescribesExpress
(
ticketCreateParam
.
getDescribesExpress
());
kylinTicketPartnerVo
.
setDescribesExpress
(
ticketCreateParam
.
getDescribesExpress
());
}
else
{
kylinTicketPartnerVo
.
setDescribesExpress
(
""
);
}
}
if
(
ticketCreateParam
.
getIsElectronic
()==
1
){
if
(
ticketCreateParam
.
getIsElectronic
()==
1
){
kylinTicketPartnerVo
.
setDescribeElectronic
(
ticketCreateParam
.
getDescribeElectronic
());
kylinTicketPartnerVo
.
setDescribeElectronic
(
ticketCreateParam
.
getDescribeElectronic
());
}
else
{
kylinTicketPartnerVo
.
setDescribeElectronic
(
""
);
}
}
kylinTicketPartnerVo
.
setStatus
(-
2
);
kylinTicketPartnerVo
.
setStatus
(-
2
);
kylinTicketPartnerVo
.
setDefault
();
kylinTicketPartnerVo
.
setDefault
();
...
@@ -296,7 +305,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
...
@@ -296,7 +305,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
LocalDateTime
createdAt
=
LocalDateTime
.
now
();
LocalDateTime
createdAt
=
LocalDateTime
.
now
();
PerformancePartnerVo
performancePartnerVo
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"performancesId"
).
is
(
performanceId
)),
PerformancePartnerVo
.
class
,
PerformancePartnerVo
.
class
.
getSimpleName
());
PerformancePartnerVo
performancePartnerVo
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"performancesId"
).
is
(
performanceId
)),
PerformancePartnerVo
.
class
,
PerformancePartnerVo
.
class
.
getSimpleName
());
if
(
performancePartnerVo
.
getAuditStatus
()==
0
){
if
(
performancePartnerVo
.
getAuditStatus
()==
0
||
performancePartnerVo
.
getAuditStatus
()==
1
){
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
20107
));
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
20107
));
}
}
...
...
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