记得上下班打卡 | 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
374f2719
Commit
374f2719
authored
Dec 17, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码 目前修复 创建演出 admin列表是查看的bug
待修复 第一次修改演出自动上线的bug
parent
46d3ae78
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
15 deletions
+21
-15
InnerService.java
...net/client/admin/zhengzai/kylin/service/InnerService.java
+3
-2
KylinPerformancesPartnerServiceImpl.java
...ime/service/impl/KylinPerformancesPartnerServiceImpl.java
+18
-13
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/InnerService.java
View file @
374f2719
...
...
@@ -17,6 +17,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import
com.liquidnet.service.kylin.dto.vo.ticketSystem.*
;
import
com.liquidnet.service.slime.dto.vo.SlimeFieldsVo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.MultiValueMap
;
...
...
@@ -32,8 +33,8 @@ import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
@Service
public
class
InnerService
{
//
@Value("${liquidnet.service.platform.url}")
private
String
platform
=
"http://127.0.0.1:9003"
;
@Value
(
"${liquidnet.service.platform.url}"
)
private
String
platform
;
@Autowired
RedisDataSourceUtil
redisDataSourceUtil
;
@Autowired
...
...
liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/service/impl/KylinPerformancesPartnerServiceImpl.java
View file @
374f2719
...
...
@@ -236,10 +236,10 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
// 获取 当前时间 -> 创建时间
LocalDateTime
createdAt
=
LocalDateTime
.
now
();
// String merchantId = step2Param.getMerchantId();
boolean
isExistsSubmit
=
mongoSlimeUtils
.
isExistsSubmitPerformancePartner
(
performanceId
);
if
(
isExistsSubmit
)
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
20112
));
}
//
boolean isExistsSubmit = mongoSlimeUtils.isExistsSubmitPerformancePartner(performanceId);
//
if (isExistsSubmit) {
//
return ResponseDto.failure(ErrorMapping.get(20112));
//
}
//演出修改数据
PerformancePartnerVo
performancePartnerVo
=
PerformancePartnerVo
.
getNew
();
...
...
@@ -270,6 +270,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
performancePartnerVo
.
setIsCreateSave
(
0
);
performancePartnerVo
.
setAuditStatus
(
0
);
mongoSlimeUtils
.
updatePerformancePartnerVoById
(
performancePartnerVo
);
kylinPerformanceMisVo
.
setFieldAuditStatus
(
performancePartnerVo
.
getFieldAuditStatus
());
//提交 票
List
<
KylinTicketTimesPartnerVo
>
kylinTicketTimesPartnerVoList
=
ticketTimesPartnerService
.
getTimesMongoList
(
performanceId
);
for
(
KylinTicketTimesPartnerVo
ticketTimes
:
kylinTicketTimesPartnerVoList
)
{
...
...
@@ -313,7 +314,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
public
ResponseDto
<
String
>
updateStep2
(
PerformanceStep2Param
step2Param
)
{
try
{
// 获取 主键id
String
merchantId
=
step2Param
.
getMerchantId
();
String
performanceId
=
step2Param
.
getPerformancesId
();
LinkedList
<
String
>
sqls
=
CollectionUtil
.
linkedListString
();
sqls
.
add
(
SqlMapping
.
get
(
"kylin_performance.updateStep2"
));
...
...
@@ -330,10 +330,10 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
LinkedList
<
Object
[]>
sqlsDataF
=
CollectionUtil
.
linkedListObjectArr
();
LocalDateTime
now
=
LocalDateTime
.
now
();
// 获取 当前时间 -> 创建时间
boolean
isExistsSubmit
=
mongoSlimeUtils
.
isExistsSubmitPerformancePartner
(
performanceId
);
if
(
isExistsSubmit
)
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
20112
));
}
//
boolean isExistsSubmit = mongoSlimeUtils.isExistsSubmitPerformancePartner(performanceId);
//
if (isExistsSubmit) {
//
return ResponseDto.failure(ErrorMapping.get(20112));
//
}
//演出修改数据
PerformancePartnerVo
performancePartnerVo
=
PerformancePartnerVo
.
getNew
();
performancePartnerVo
.
setPerformancesId
(
performanceId
);
...
...
@@ -350,7 +350,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
// if (fieldsVo.getClaimStatus() == 1) {
// performancePartnerVo.setFieldAuditStatus(fieldsVo.getIsCheck());
// } else {
//
performancePartnerVo.setFieldAuditStatus(0);
performancePartnerVo
.
setFieldAuditStatus
(
0
);
// }
// }
...
...
@@ -364,6 +364,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
performancePartnerVo
.
setStatus
(
9
);
}
mongoSlimeUtils
.
updatePerformancePartnerVoById
(
performancePartnerVo
);
KylinPerformanceVo
kylinPerformanceVo
=
KylinPerformanceVo
.
getNew
();
kylinPerformanceVo
.
setPerformancesId
(
performancePartnerVo
.
getPerformancesId
());
kylinPerformanceVo
.
setAuditStatus
(
performancePartnerVo
.
getAuditStatus
());
kylinPerformanceVo
.
setFieldAuditStatus
(
performancePartnerVo
.
getFieldAuditStatus
());
mongoSlimeUtils
.
updateKylinPerformanceVoById
(
kylinPerformanceVo
);
//提交 票
List
<
KylinTicketTimesPartnerVo
>
kylinTicketTimesPartnerVoList
=
ticketTimesPartnerService
.
getTimesMongoList
(
performanceId
);
for
(
KylinTicketTimesPartnerVo
ticketTimes
:
kylinTicketTimesPartnerVoList
)
{
...
...
@@ -840,7 +845,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
changeVo
.
setFieldAuditStatus
(
status
);
changeVo
.
setRejectTxt
(
rejectTxt
);
changeVo
.
setPerformancesId
(
performancesId
);
if
(
status
==
2
)
{
if
(
status
==
2
)
{
changeVo
.
setAuditStatus
(
status
);
}
mongoSlimeUtils
.
updateKylinPerformanceVoById
(
changeVo
);
...
...
@@ -850,13 +855,13 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
changePartnerVo
.
setFieldAuditStatus
(
status
);
changePartnerVo
.
setRejectTxt
(
rejectTxt
);
changePartnerVo
.
setUpdatedAt
(
now
.
format
(
DateUtil
.
DTF_YMD_HMS
));
if
(
status
==
2
)
{
if
(
status
==
2
)
{
changePartnerVo
.
setAuditStatus
(
status
);
}
mongoSlimeUtils
.
updatePerformancePartnerVoById
(
changePartnerVo
);
queueUtil
.
sendMsgByRedis
(
MQConst
.
SlimeQueue
.
SQL_SLIME_PERFORMANCE_UPDATE
.
getKey
(),
SqlMapping
.
get
(
"kylin_performance_status.fieldsStatus"
,
status
,
status
,
rejectTxt
,
performancesId
,
now
,
now
status
,
status
,
rejectTxt
,
performancesId
,
now
,
now
));
}
return
ResponseDto
.
success
(
"审核完成"
);
...
...
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