记得上下班打卡 | 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
d32e1413
Commit
d32e1413
authored
Aug 01, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
57016fd7
505e6a60
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
12 deletions
+27
-12
KylinRefundsStatusServiceImpl.java
...zai/kylin/service/impl/KylinRefundsStatusServiceImpl.java
+9
-2
PerformanceVoUtils.java
...client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
+18
-10
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java
View file @
d32e1413
...
...
@@ -391,11 +391,18 @@ public class KylinRefundsStatusServiceImpl {
kylinOrderRefundsVo
.
setUpdatedAt
(
LocalDateTime
.
now
());
kylinOrderRefundsVo
.
setReason
(
"11111"
);
log
.
info
(
"kylinOrderRefundsVo-"
+
kylinOrderRefundsVo
.
getStatus
());
for
(
String
refundId
:
orderRefundIds
)
{
BasicDBObject
object
=
new
BasicDBObject
(
"$set"
,
mongoConverter
.
convertToMongoType
(
kylinOrderRefundsVo
));
UpdateResult
updateResult
=
mongoTemplate
.
getCollection
(
KylinOrderRefundsVo
.
class
.
getSimpleName
()).
updateOne
(
Query
.
query
(
Criteria
.
where
(
"orderRefundsId"
).
in
(
orderRefundIds
)).
getQueryObject
(),
Query
.
query
(
Criteria
.
where
(
"orderRefundsId"
).
is
(
refundId
)).
getQueryObject
(),
object
);
}
/*BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderRefundsId").in(orderRefundIds)).getQueryObject(),
object
);*/
dataUtils
.
delOrderRefundVo
(
orderRefundIds
);
dataUtils
.
delOrderRefundVoByOrderId
(
orderIds
);
log
.
info
(
"type-5"
);
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @
d32e1413
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
kylin
.
utils
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.fasterxml.jackson.core.type.TypeReference
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
...
...
@@ -273,6 +274,22 @@ public class PerformanceVoUtils {
//场次数据
List
<
KylinTicketTimesPartnerVo
>
kylinTicketTimesPartnerVos
=
getTimesMongoList
(
performancesId
);
int
isMember
=
0
;
try
{
for
(
KylinTicketTimesPartnerVo
ticketTimeItem
:
kylinTicketTimesPartnerVos
)
{
//修改票
List
<
KylinTicketPartnerVo
>
kylinTicketPartnerVoList
=
getTicketMongoList
(
ticketTimeItem
.
getTicketTimesId
());
for
(
KylinTicketPartnerVo
ticketItem
:
kylinTicketPartnerVoList
)
{
if
(
ticketStatusMapper
.
selectOne
(
Wrappers
.
lambdaQuery
(
KylinTicketStatus
.
class
).
eq
(
KylinTicketStatus:
:
getTicketId
,
ticketItem
.
getTicketsId
())).
getIsMember
().
equals
(
1
))
{
isMember
=
1
;
break
;
}
}
}
}
catch
(
Exception
e
){
}
for
(
KylinTicketTimesPartnerVo
ticketTimeItem
:
kylinTicketTimesPartnerVos
)
{
//创建场次
KylinTicketTimes
ticketTimes
=
new
KylinTicketTimes
();
...
...
@@ -311,14 +328,6 @@ public class PerformanceVoUtils {
//修改票
List
<
KylinTicketPartnerVo
>
kylinTicketPartnerVoList
=
getTicketMongoList
(
ticketTimeItem
.
getTicketTimesId
());
int
isMember
=
0
;
for
(
KylinTicketPartnerVo
ticketItem
:
kylinTicketPartnerVoList
)
{
if
(
ticketItem
.
getIsMember
().
equals
(
1
))
{
isMember
=
1
;
}
}
for
(
KylinTicketPartnerVo
ticketItem
:
kylinTicketPartnerVoList
)
{
KylinTicketPartnerVo
kylinTicketPartnerVo
;
kylinTicketPartnerVo
=
mongoTemplate
.
findOne
(
...
...
@@ -362,7 +371,6 @@ public class PerformanceVoUtils {
ticketRelations
.
setTicketId
(
tickets
.
getTicketsId
());
ticketRelations
.
setUpdatedAt
(
updatedAt
);
if
(
ticketItem
.
getStatus
()
==
-
2
)
{
KylinTicketPartnerVo
item
=
kylinTicketPartnerVoList
.
get
(
0
);
tickets
.
setAdvanceMinuteMember
(
5
);
ticketStatus
.
setIsMember
(
isMember
);
ticketStatus
.
setMemberLimitCount
(
1
);
...
...
@@ -417,7 +425,7 @@ public class PerformanceVoUtils {
}
public
List
<
KylinTicketTimesPartnerVo
>
getTimesMongoList
(
String
performancesId
)
{
return
mongoTemplate
.
find
(
Query
.
query
(
Criteria
.
where
(
"performancesId"
).
is
(
performancesId
)).
with
(
Sort
.
by
(
Sort
.
Direction
.
DESC
,
"createdAt"
)),
KylinTicketTimesPartnerVo
.
class
,
KylinTicketTimesPartnerVo
.
class
.
getSimpleName
());
return
mongoTemplate
.
find
(
Query
.
query
(
Criteria
.
where
(
"performancesId"
).
is
(
performancesId
)).
with
(
Sort
.
by
(
Sort
.
Direction
.
DESC
,
"createdAt"
)),
KylinTicketTimesPartnerVo
.
class
,
KylinTicketTimesPartnerVo
.
class
.
getSimpleName
());
}
}
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