记得上下班打卡 | 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
a605d56d
Commit
a605d56d
authored
Dec 18, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 提交审核 自动上线的bug
parent
374f2719
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
14 deletions
+13
-14
KylinPerformanceVo.java
...uidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
+1
-1
KylinPerformancesAdminServiceImpl.java
...kylin/service/impl/KylinPerformancesAdminServiceImpl.java
+4
-4
PerformanceVoUtils.java
...client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
+5
-3
RedisUtil.java
...java/com.liquidnet.common.cache/redis/util/RedisUtil.java
+2
-6
KylinPerformancesPartnerServiceImpl.java
...ime/service/impl/KylinPerformancesPartnerServiceImpl.java
+1
-0
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
View file @
a605d56d
...
@@ -188,7 +188,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable{
...
@@ -188,7 +188,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable{
this
.
stopSellTime
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
stopSellTime
);
this
.
stopSellTime
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
stopSellTime
);
this
.
sellMemberTime
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
sellMemberTime
);
this
.
sellMemberTime
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
sellMemberTime
);
this
.
sellTime
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
sellTime
);
this
.
sellTime
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
sellTime
);
this
.
appStatus
=
9
;
//
this.appStatus = 9;
this
.
isDiscount
=
isDiscount
;
this
.
isDiscount
=
isDiscount
;
this
.
isAdvance
=
isAdvance
;
this
.
isAdvance
=
isAdvance
;
this
.
message
=
""
;
this
.
message
=
""
;
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
View file @
a605d56d
...
@@ -103,7 +103,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
...
@@ -103,7 +103,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
@Override
@Override
public
KylinPerformanceMisVo
performanceDetails
(
String
performancesId
)
{
public
KylinPerformanceMisVo
performanceDetails
(
String
performancesId
)
{
log
.
info
(
" PERFORMANCE mis演出详情"
);
log
.
info
(
" PERFORMANCE mis演出详情"
);
KylinPerformanceMisVo
createMisVo
=
performanceVoUtils
.
getPerformanceMisVo
(
performancesId
);
KylinPerformanceMisVo
createMisVo
=
performanceVoUtils
.
getPerformanceMisVo
(
performancesId
,
null
);
return
createMisVo
;
return
createMisVo
;
}
}
...
@@ -162,15 +162,15 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
...
@@ -162,15 +162,15 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
}
}
}
}
performanceVoUtils
.
performanceVoStatus
(
performancesId
);
performanceVoUtils
.
performanceVoStatus
(
performancesId
);
//
同步演出
//
同步演出
innerService
.
reportP
(
dataUtils
.
getPerformanceVo
(
performancesId
),
null
,
null
);
//
innerService.reportP(dataUtils.getPerformanceVo(performancesId), null, null);
}
else
{
//只修改演出相关 场次 票 (不包括 库存 售卖时间 限购)
}
else
{
//只修改演出相关 场次 票 (不包括 库存 售卖时间 限购)
log
.
info
(
" PERFORMANCE 演出审核 修改"
);
log
.
info
(
" PERFORMANCE 演出审核 修改"
);
HashMap
<
String
,
Object
>
mapSql
=
new
HashMap
<>();
HashMap
<
String
,
Object
>
mapSql
=
new
HashMap
<>();
mapSql
.
put
(
"status"
,
9
);
mapSql
.
put
(
"status"
,
9
);
mapSql
.
put
(
"updatedAt"
,
updatedAt
.
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)));
mapSql
.
put
(
"updatedAt"
,
updatedAt
.
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)));
KylinPerformanceMisVo
vo
=
performanceVoUtils
.
getPerformanceMisVo
(
performancesId
);
KylinPerformanceMisVo
vo
=
performanceVoUtils
.
getPerformanceMisVo
(
performancesId
,
"0"
);
performanceVoUtils
.
updatePerformanceMySql
(
performancesId
,
mapSql
,
vo
,
updatedAt
,
auditStatus
);
performanceVoUtils
.
updatePerformanceMySql
(
performancesId
,
mapSql
,
vo
,
updatedAt
,
auditStatus
);
// if (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus() != 7) {//若 演出上 则 线判断状态
// if (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus() != 7) {//若 演出上 则 线判断状态
performanceVoUtils
.
performanceVoStatus
(
performancesId
);
performanceVoUtils
.
performanceVoStatus
(
performancesId
);
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @
a605d56d
...
@@ -189,11 +189,13 @@ public class PerformanceVoUtils {
...
@@ -189,11 +189,13 @@ public class PerformanceVoUtils {
* @param performancesId
* @param performancesId
* @return
* @return
*/
*/
public
KylinPerformanceMisVo
getPerformanceMisVo
(
String
performancesId
)
{
public
KylinPerformanceMisVo
getPerformanceMisVo
(
String
performancesId
,
String
auditStatus
)
{
PerformancePartnerVo
performanceData
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"performancesId"
).
is
(
performancesId
)),
PerformancePartnerVo
.
class
,
PerformancePartnerVo
.
class
.
getSimpleName
());
PerformancePartnerVo
performanceData
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"performancesId"
).
is
(
performancesId
)),
PerformancePartnerVo
.
class
,
PerformancePartnerVo
.
class
.
getSimpleName
());
List
<
KylinTicketTimesPartnerVo
>
kylinTicketTimesPartnerVos
=
getTimesMongoList
(
performancesId
);
List
<
KylinTicketTimesPartnerVo
>
kylinTicketTimesPartnerVos
=
getTimesMongoList
(
performancesId
);
List
<
TicketTimesTicketCreatePartnerVo
>
ticketTimesTicketCreatePartnerVoList
=
new
ArrayList
();
List
<
TicketTimesTicketCreatePartnerVo
>
ticketTimesTicketCreatePartnerVoList
=
new
ArrayList
();
if
(
auditStatus
!=
null
&&
auditStatus
.
equals
(
"0"
))
{
performanceData
.
setAuditStatus
(
0
);
}
//不需要审核
//不需要审核
if
(
performanceData
.
getAuditStatus
().
equals
(
1
)
&&
performanceData
.
getFieldAuditStatus
().
equals
(
0
))
{
if
(
performanceData
.
getAuditStatus
().
equals
(
1
)
&&
performanceData
.
getFieldAuditStatus
().
equals
(
0
))
{
return
getPerformanceMisDB
(
performancesId
);
return
getPerformanceMisDB
(
performancesId
);
...
@@ -265,7 +267,7 @@ public class PerformanceVoUtils {
...
@@ -265,7 +267,7 @@ public class PerformanceVoUtils {
KylinTickets
tickets
=
ticketsMapper
.
selectOne
(
Wrappers
.
lambdaQuery
(
KylinTickets
.
class
).
eq
(
KylinTickets:
:
getTicketsId
,
item
.
getTicketId
()));
KylinTickets
tickets
=
ticketsMapper
.
selectOne
(
Wrappers
.
lambdaQuery
(
KylinTickets
.
class
).
eq
(
KylinTickets:
:
getTicketsId
,
item
.
getTicketId
()));
KylinTicketStatus
ticketStatus
=
ticketStatusMapper
.
selectOne
(
Wrappers
.
lambdaQuery
(
KylinTicketStatus
.
class
).
eq
(
KylinTicketStatus:
:
getTicketId
,
item
.
getTicketId
()));
KylinTicketStatus
ticketStatus
=
ticketStatusMapper
.
selectOne
(
Wrappers
.
lambdaQuery
(
KylinTicketStatus
.
class
).
eq
(
KylinTicketStatus:
:
getTicketId
,
item
.
getTicketId
()));
List
<
ExpressModuleVo
>
moduleVoList
=
new
ArrayList
();
List
<
ExpressModuleVo
>
moduleVoList
=
new
ArrayList
();
if
(
ticketStatus
.
getIsExpress
()==
1
)
{
if
(
ticketStatus
.
getIsExpress
()
==
1
)
{
moduleVoList
=
dataUtils
.
getTEMVo
(
item
.
getTicketId
()).
getProduceCodeList
();
moduleVoList
=
dataUtils
.
getTEMVo
(
item
.
getTicketId
()).
getProduceCodeList
();
}
}
kylinTicketPartnerVos
.
add
(
KylinTicketPartnerVo
.
getNew
().
copy
(
tickets
,
ticketStatus
,
item
,
moduleVoList
));
kylinTicketPartnerVos
.
add
(
KylinTicketPartnerVo
.
getNew
().
copy
(
tickets
,
ticketStatus
,
item
,
moduleVoList
));
...
...
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java
View file @
a605d56d
...
@@ -34,12 +34,8 @@ public final class RedisUtil extends AbstractRedisUtil{
...
@@ -34,12 +34,8 @@ public final class RedisUtil extends AbstractRedisUtil{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
String
[]
keys
=
{
String
[]
keys
=
{
"kylin:performances_inventory:ticket:id:575422212015185926395076:surplusGeneral"
,
"stone:user:$uid::surplusGeneral"
,
"kylin:performances_inventory:ticket:id:575423832945909762737992:surplusGeneral"
,
"stone:item:logs:list:$uid"
"kylin:performances_inventory:ticket:id:575424371127296001891205:surplusGeneral"
,
"kylin:performances_inventory:ticket:id:575424699866603521727423:surplusGeneral"
,
"kylin:order:id:585322149365514243983160"
,
"kylin:order:id:585326057257123847506471"
};
};
for
(
String
key
:
keys
)
{
for
(
String
key
:
keys
)
{
long
value
=
key
.
hashCode
();
long
value
=
key
.
hashCode
();
...
...
liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/service/impl/KylinPerformancesPartnerServiceImpl.java
View file @
a605d56d
...
@@ -369,6 +369,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
...
@@ -369,6 +369,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
kylinPerformanceVo
.
setAuditStatus
(
performancePartnerVo
.
getAuditStatus
());
kylinPerformanceVo
.
setAuditStatus
(
performancePartnerVo
.
getAuditStatus
());
kylinPerformanceVo
.
setFieldAuditStatus
(
performancePartnerVo
.
getFieldAuditStatus
());
kylinPerformanceVo
.
setFieldAuditStatus
(
performancePartnerVo
.
getFieldAuditStatus
());
mongoSlimeUtils
.
updateKylinPerformanceVoById
(
kylinPerformanceVo
);
mongoSlimeUtils
.
updateKylinPerformanceVoById
(
kylinPerformanceVo
);
redisSlimeUtils
.
delPerformanceVo
(
kylinPerformanceVo
.
getPerformancesId
());
//提交 票
//提交 票
List
<
KylinTicketTimesPartnerVo
>
kylinTicketTimesPartnerVoList
=
ticketTimesPartnerService
.
getTimesMongoList
(
performanceId
);
List
<
KylinTicketTimesPartnerVo
>
kylinTicketTimesPartnerVoList
=
ticketTimesPartnerService
.
getTimesMongoList
(
performanceId
);
for
(
KylinTicketTimesPartnerVo
ticketTimes
:
kylinTicketTimesPartnerVoList
)
{
for
(
KylinTicketTimesPartnerVo
ticketTimes
:
kylinTicketTimesPartnerVoList
)
{
...
...
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