记得上下班打卡 | 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
20be9525
Commit
20be9525
authored
Aug 03, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 提示文案
parent
ea790cb0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
12 deletions
+14
-12
KylinTicketVo.java
.../liquidnet/service/kylin/dto/vo/middle/KylinTicketVo.java
+5
-3
KylinOrderTicketsServiceImpl.java
...vice/order/service/impl/KylinOrderTicketsServiceImpl.java
+3
-3
OrderUtils.java
...in/java/com/liquidnet/service/order/utils/OrderUtils.java
+6
-6
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/middle/KylinTicketVo.java
View file @
20be9525
...
...
@@ -18,7 +18,7 @@ import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
@Data
@ApiModel
public
class
KylinTicketVo
implements
Serializable
,
Cloneable
{
public
class
KylinTicketVo
implements
Serializable
,
Cloneable
{
private
Integer
mid
;
@ApiModelProperty
(
value
=
"主键"
)
...
...
@@ -103,7 +103,7 @@ public class KylinTicketVo implements Serializable,Cloneable{
private
Integer
totalExchange
;
public
Integer
getIdCount
()
{
return
idCount
==
null
?
limitCount:
idCount
;
return
idCount
==
null
?
limitCount
:
idCount
;
}
public
void
setTicket
(
KylinTickets
ticket
)
{
...
...
@@ -169,7 +169,7 @@ public class KylinTicketVo implements Serializable,Cloneable{
this
.
timeStart
=
ticket
.
getTimeStart
();
this
.
timeEnd
=
ticket
.
getTimeEnd
();
this
.
advanceMinuteMember
=
5
;
this
.
memberTimeStart
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
LocalDateTime
.
parse
(
ticket
.
getTimeStart
(),
DTF_YMD_HMS
).
plusMinutes
(-
5
));
this
.
memberTimeStart
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
LocalDateTime
.
parse
(
ticket
.
getTimeStart
(),
DTF_YMD_HMS
).
plusMinutes
(-
5
));
if
(
ticket
.
getTimeEndExpress
()
!=
null
)
{
this
.
timeEndExpress
=
ticket
.
getTimeEndExpress
();
}
else
{
...
...
@@ -194,6 +194,7 @@ public class KylinTicketVo implements Serializable,Cloneable{
this
.
isStudent
=
ticketStatus
.
getIsStudent
();
this
.
limitCountMember
=
1
;
this
.
limitCount
=
ticketStatus
.
getLimitCount
();
this
.
idCount
=
ticketStatus
.
getIdCount
();
this
.
counts
=
ticketStatus
.
getCounts
();
this
.
sysDamai
=
0
;
this
.
isShowCode
=
ticketStatus
.
getIsShowCode
();
...
...
@@ -203,6 +204,7 @@ public class KylinTicketVo implements Serializable,Cloneable{
}
private
static
final
KylinTicketVo
obj
=
new
KylinTicketVo
();
public
static
KylinTicketVo
getNew
()
{
try
{
return
(
KylinTicketVo
)
obj
.
clone
();
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @
20be9525
...
...
@@ -208,12 +208,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
int
memberType
;
//会员状态 不需要判断会员 1判断会员逻辑 2会员专属
if
(
DateUtil
.
compareStrDay
(
DateUtil
.
getNowTime
(),
memberTimeStart
)
==
1
&&
DateUtil
.
compareStrDay
(
DateUtil
.
getNowTime
(),
timeStart
)
==
-
1
)
{
//优先时间
if
(
payOrderParam
.
getNumber
()
>
ticketData
.
getCounts
())
{
return
ResponseDto
.
failure
(
"
非法下单
"
);
return
ResponseDto
.
failure
(
"
优先购时段内,本场演出限购"
+
ticketData
.
getCounts
()+
"张
"
);
}
int
advanceCount
=
dataUtils
.
incrUseMemberCount
(
uid
,
performanceData
.
getPerformancesId
());
if
(
advanceCount
>
1
)
{
//todo
dataUtils
.
decrUseMemberCount
(
uid
,
performanceData
.
getPerformancesId
());
return
ResponseDto
.
failure
(
"
非法下单
"
);
return
ResponseDto
.
failure
(
"
本场演出限用1张优先券,已超出
"
);
}
}
if
(
ticketData
.
getIsExclusive
()
==
1
)
{
...
...
@@ -279,7 +279,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
if
(
couponCount
>
1
)
{
//todo
useAdvance
=
false
;
dataUtils
.
decrUseCouponCount
(
uid
,
performanceData
.
getPerformancesId
());
return
ResponseDto
.
failure
(
"
非法下单
"
);
return
ResponseDto
.
failure
(
"
本场演出限用1张优先券,已超出
"
);
}
}
}
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java
View file @
20be9525
...
...
@@ -98,12 +98,12 @@ public class OrderUtils {
public
String
judgeMemberType
(
int
performanceLimitCount
,
int
performanceMemberLimitCount
,
int
performanceLimitIdCard
,
int
ticketLimitCount
,
int
ticketMemberLimitCount
,
int
ticketLimitIdCard
,
int
memberType
,
int
performanceBuyCountUid
,
int
ticketBuyCountUid
,
int
performanceBuyCountIdCard
,
int
ticketBuyCountIdCard
,
int
isTrueName
)
{
// log.debug
("会员限购演出=" + performanceMemberLimitCount);
// log.debug
("限购演出=" + performanceLimitCount);
// log.debug
("实名限购演出=" + performanceLimitIdCard);
// log.debug
("会员限购票种=" + ticketMemberLimitCount);
// log.debug
("限购票种=" + ticketLimitCount);
// log.debug
("实名限购票种=" + ticketLimitIdCard);
log
.
info
(
"会员限购演出="
+
performanceMemberLimitCount
);
log
.
info
(
"限购演出="
+
performanceLimitCount
);
log
.
info
(
"实名限购演出="
+
performanceLimitIdCard
);
log
.
info
(
"会员限购票种="
+
ticketMemberLimitCount
);
log
.
info
(
"限购票种="
+
ticketLimitCount
);
log
.
info
(
"实名限购票种="
+
ticketLimitIdCard
);
log
.
info
(
"演出数量="
+
performanceBuyCountUid
);
log
.
info
(
"演出实名数量="
+
performanceBuyCountIdCard
);
...
...
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