记得上下班打卡 | 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
6e3f5cce
Commit
6e3f5cce
authored
Jun 10, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改时间
parent
0965db7b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
14 deletions
+14
-14
PerformancePartnerListParam.java
.../service/kylin/dto/param/PerformancePartnerListParam.java
+3
-1
PerformanceVoUtils.java
...client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
+2
-2
DateUtil.java
...c/main/java/com/liquidnet/commons/lang/util/DateUtil.java
+0
-4
KylinCheckUserPerformancesPartnerServiceImpl.java
...partner/KylinCheckUserPerformancesPartnerServiceImpl.java
+2
-1
KylinPerformancesPartnerServiceImpl.java
...ice/impl/partner/KylinPerformancesPartnerServiceImpl.java
+5
-4
PerformanceVoTask.java
.../liquidnet/service/kylin/timerTask/PerformanceVoTask.java
+2
-2
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformancePartnerListParam.java
View file @
6e3f5cce
package
com
.
liquidnet
.
service
.
kylin
.
dto
.
param
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
...
...
@@ -71,6 +72,7 @@ public class PerformancePartnerListParam {
public
void
setStopSellDay
(
Long
stopSellDay
)
{
this
.
stopSellDay
=
stopSellDay
;
LocalDateTime
now
=
LocalDateTime
.
now
();
this
.
stopSellTime
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
).
format
(
now
.
plusDays
(-
stopSellDay
));
this
.
stopSellTime
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
).
format
(
now
.
plusDays
(-
stopSellDay
));
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @
6e3f5cce
...
...
@@ -111,8 +111,8 @@ public class PerformanceVoUtils {
ticketCount
+=
kylinTicketVoList
.
size
();
for
(
KylinTicketVo
kylinTicketVoItem
:
kylinTicketVoList
)
{
//时间判断
LocalDateTime
timeStart
=
LocalDateTime
.
parse
(
kylinTicketVoItem
.
getMemberTimeStart
(),
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
LocalDateTime
timeEnd
=
LocalDateTime
.
parse
(
kylinTicketVoItem
.
getTimeEnd
(),
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
LocalDateTime
timeStart
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
kylinTicketVoItem
.
getMemberTimeStart
(
));
LocalDateTime
timeEnd
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
kylinTicketVoItem
.
getTimeEnd
(
));
int
surplusGeneral
=
-
1
;
int
status
=
0
;
if
(
timeStart
.
isAfter
(
timeNow
))
{
...
...
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/DateUtil.java
View file @
6e3f5cce
...
...
@@ -474,10 +474,6 @@ public abstract class DateUtil {
return
dayLast
+
" 23:59:59"
;
}
public
static
LocalDateTime
stringToLocalDateTime
(
String
str
)
{
return
LocalDateTime
.
parse
(
str
,
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
}
public
static
void
main
(
String
[]
args
)
{
//
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinCheckUserPerformancesPartnerServiceImpl.java
View file @
6e3f5cce
...
...
@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.service.impl.partner;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.service.base.ErrorMapping
;
import
com.liquidnet.service.base.ResponseDto
;
...
...
@@ -80,7 +81,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
for
(
CheckPerformanceRelationParam
item
:
param
.
getCheckPerformanceRelationParamList
())
{
KylinCheckUserPerformances
checkUserPerformances
=
new
KylinCheckUserPerformances
();
checkUserPerformances
.
setCheckUserId
(
param
.
getCheckUserId
());
checkUserPerformances
.
setCanDownTime
(
LocalDateTime
.
parse
(
item
.
getCanDownTime
(),
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)));
checkUserPerformances
.
setCanDownTime
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
item
.
getCanDownTime
(
)));
checkUserPerformances
.
setPerformanceId
(
item
.
getPerformanceId
());
checkUserPerformances
.
setCheckUserPerformanceId
(
IDGenerator
.
nextSnowId
().
toString
());
checkUserPerformances
.
setCreatedAt
(
LocalDateTime
.
now
());
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java
View file @
6e3f5cce
...
...
@@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.commons.lang.util.BeanUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.service.base.ErrorMapping
;
import
com.liquidnet.service.base.ResponseDto
;
...
...
@@ -229,7 +230,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
if
(
performanceStatus
==
null
||
performanceStatus
.
getStatus
()
==
0
||
performanceStatus
.
getStatus
()
==
4
)
{
result
=
createStep2
(
step2Param
);
log
.
info
(
" PERFORMANCE 演出第二步 创建(拒绝/撤回/第一次)"
);
}
else
if
(
performanceStatus
.
getStatus
()
==
1
||
performanceStatus
.
getStatus
()
==
3
||
performanceStatus
.
getStatus
()
==
6
||
performanceStatus
.
getStatus
()
==
7
||
performanceStatus
.
getStatus
()
==
8
||
performanceStatus
.
getStatus
()
==
9
)
{
// 修改
}
else
if
(
performanceStatus
.
getStatus
()
==
1
||
performanceStatus
.
getStatus
()
==
3
||
performanceStatus
.
getStatus
()
==
6
||
performanceStatus
.
getStatus
()
==
7
||
performanceStatus
.
getStatus
()
==
8
||
performanceStatus
.
getStatus
()
==
9
)
{
// 修改
result
=
updateStep2
(
step2Param
);
log
.
info
(
" PERFORMANCE 演出第二步 修改"
);
}
...
...
@@ -388,8 +389,8 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
inventory
.
setLimitCount
(
ticketItem
.
getLimitCount
());
//修改 mysql 售卖时间
KylinTickets
ticketSellTime
=
new
KylinTickets
();
ticketSellTime
.
setTimeEnd
(
LocalDateTime
.
parse
(
ticketItem
.
getTimeEnd
(),
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)));
ticketSellTime
.
setTimeStart
(
LocalDateTime
.
parse
(
ticketItem
.
getTimeStart
(),
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)));
ticketSellTime
.
setTimeEnd
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
ticketItem
.
getTimeEnd
(
)));
ticketSellTime
.
setTimeStart
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
ticketItem
.
getTimeStart
(
)));
ticketSellTime
.
setAdvanceMinuteMember
(
null
);
//修改 价格
ticketSellTime
.
setPrice
(
ticketItem
.
getPrice
());
...
...
@@ -502,7 +503,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
dataUtils
.
updatePerformanceMongo
(
performancesId
);
return
ResponseDto
.
success
(
"下线成功"
);
}
else
{
}
else
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
20111
));
}
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java
View file @
6e3f5cce
...
...
@@ -119,8 +119,8 @@ public class PerformanceVoTask {
ticketCount
+=
kylinTicketVoList
.
size
();
for
(
KylinTicketVo
kylinTicketVoItem
:
kylinTicketVoList
)
{
//时间判断
LocalDateTime
timeStart
=
LocalDateTime
.
parse
(
kylinTicketVoItem
.
getMemberTimeStart
(),
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
LocalDateTime
timeEnd
=
LocalDateTime
.
parse
(
kylinTicketVoItem
.
getTimeEnd
(),
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
LocalDateTime
timeStart
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
kylinTicketVoItem
.
getMemberTimeStart
(
));
LocalDateTime
timeEnd
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
kylinTicketVoItem
.
getTimeEnd
(
));
int
surplusGeneral
=
-
1
;
int
status
=
0
;
if
(
timeStart
.
isAfter
(
timeNow
))
{
...
...
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