记得上下班打卡 | 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
a03bc339
Commit
a03bc339
authored
Jun 22, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
32b80b02
e028e331
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
219 additions
and
67 deletions
+219
-67
application-dev.yml
liquidnet-bus-config/liquidnet-config/application-dev.yml
+14
-0
application-prod.yml
liquidnet-bus-config/liquidnet-config/application-prod.yml
+39
-21
application-test.yml
liquidnet-bus-config/liquidnet-config/application-test.yml
+14
-0
liquidnet-client-job-prod.yml
...bus-config/liquidnet-config/liquidnet-client-job-prod.yml
+10
-0
liquidnet-service-adam-dev.yml
...us-config/liquidnet-config/liquidnet-service-adam-dev.yml
+4
-4
liquidnet-service-adam-prod.yml
...s-config/liquidnet-config/liquidnet-service-adam-prod.yml
+35
-0
liquidnet-service-adam-test.yml
...s-config/liquidnet-config/liquidnet-service-adam-test.yml
+4
-4
liquidnet-service-consumer-prod.yml
...nfig/liquidnet-config/liquidnet-service-consumer-prod.yml
+24
-0
liquidnet-service-executor-main-prod.yml
...liquidnet-config/liquidnet-service-executor-main-prod.yml
+23
-0
liquidnet-service-kylin-dev.yml
...s-config/liquidnet-config/liquidnet-service-kylin-dev.yml
+4
-4
liquidnet-service-kylin-prod.yml
...-config/liquidnet-config/liquidnet-service-kylin-prod.yml
+32
-0
liquidnet-service-kylin-test.yml
...-config/liquidnet-config/liquidnet-service-kylin-test.yml
+4
-4
KylinOrderTicketsServiceImpl.java
...vice/kylin/service/impl/KylinOrderTicketsServiceImpl.java
+12
-12
KylinPerformancesPartnerServiceImpl.java
...ice/impl/partner/KylinPerformancesPartnerServiceImpl.java
+0
-9
KylinTicketTimesPartnerServiceImpl.java
...vice/impl/partner/KylinTicketTimesPartnerServiceImpl.java
+0
-3
KylinTicketsPartnerServiceImpl.java
.../service/impl/partner/KylinTicketsPartnerServiceImpl.java
+0
-6
No files found.
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @
a03bc339
...
...
@@ -32,6 +32,20 @@ liquidnet:
user
:
root
pwd
:
S&y$6d*JwJ
service
:
adam
:
url-pay
:
pay
:
http://testpay.zhengzai.tv
check
:
http://testpay.zhengzai.tv/order/verify
callback
:
http://devadam.zhengzai.tv/adam/member/order/callback
url-service
:
url
:
http://testservice.zhengzai.tv
kylin
:
url-pay
:
pay
:
http://testpay.zhengzai.tv/
check
:
http://testpay.zhengzai.tv/order/verify
localUrl
:
http://devkylin.zhengzai.tv/kylin/order/syncOrder
url-service
:
url
:
http://testservice.zhengzai.tv/
executor-main
:
xxl
:
admin
:
...
...
liquidnet-bus-config/liquidnet-config/application-prod.yml
View file @
a03bc339
config-server-git
:
prod
#application-
dev
-begin
#application-
prod
-begin
#这里后续添加公共参数值
liquidnet
:
security
:
username
:
user
password
:
user123
jwt
:
secret
:
qZHglvNP0n0aOOckHiQXq5JMD468J4eG
expire-ttl
:
43200
refresh-ttl
:
525600
blacklist_grace_period
:
5
mysql
:
urlHostAndPort
:
192.168.31.205
:3306
username
:
liquidnet
password
:
LiquidNet!@#4
urlHostAndPort
:
zhengzai-test.rwlb.rds.aliyuncs.com
:3306
username
:
zhengzai
password
:
$hAh4SGcDQ
rabbitmq
:
host
:
192.168.31.205
host
:
amqp-cn-7pp26mhtn001.mq-amqp.cn-beijing-327844-a-internal.aliyuncs.com
port
:
5672
username
:
liquidnet
password
:
LiquidNet!@#4
username
:
MjphbXFwLWNuLTdwcDI2bWh0bjAwMTpMVEFJNXRGajR0UWplbW82NjRCcmtxS1o=
password
:
MzlENTBFRDE0NEE4MkM1RUE2MTc1RDhBMTVFNzhDQTNDQTQ3NEY4RDoxNjIyODE1ODU3ODEz
virtual-host
:
liquidnet
knife4j
:
disable
:
tru
e
disable
:
fals
e
redis
:
host
:
192.168.31.205
port
:
6379
password
:
LiquidNet!@#4
host
:
r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
# host: r-2zefzyjbij5vbez65y.redis.rds.aliyuncs.com
port
:
6380
password
:
PO@B!Iud32
# host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
# port: 6380
# password: PO@B!Iud32
mongodb
:
host
:
192.168.31.205
port
:
27017
gfsdatabasename
:
liquidnet_mgdb
#以下为各应用需要用到的ip及端口设置
#涉及到ip的地方尽量都放入公共变量,方便统一修改
#以下liquidnet.service.adam.conf.webUrl 对应liquidnet.conf.webUrl 依此类推
host
:
s-2zef656730e5a1d4.mongodb.rds.aliyuncs.com:3717,s-2ze49872ed6aeb14.mongodb.rds.aliyuncs.com:3717
port
:
3717
user
:
root
pwd
:
$hAh4SGcDQ
service
:
adam
:
conf
:
webUrl
:
http://192.168.31.205
url-pay
:
pay
:
http://pay.zhengzai.tv
check
:
http://pay.zhengzai.tv/order/verify
callback
:
http://adam.zhengzai.tv/adam/member/order/callback
url-service
:
url
:
http://service.zhengzai.tv
kylin
:
url-pay
:
pay
:
http://pay.zhengzai.tv/
check
:
http://pay.zhengzai.tv/order/verify
localUrl
:
http://kylin.zhengzai.tv/kylin/order/syncOrder
url-service
:
url
:
http://service.zhengzai.tv/
executor-main
:
xxl
:
admin
:
addresses
:
192.168.31.205:8090
#application-dev-end
\ No newline at end of file
addresses
:
172.17.121.166:8090
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @
a03bc339
...
...
@@ -36,6 +36,20 @@ liquidnet:
user
:
root
pwd
:
$hAh4SGcDQ
service
:
adam
:
url-pay
:
pay
:
http://testpay.zhengzai.tv
check
:
http://testpay.zhengzai.tv/order/verify
callback
:
http://adam.zhengzai.tv/adam/member/order/callback
url-service
:
url
:
http://testservice.zhengzai.tv
kylin
:
url-pay
:
pay
:
http://testpay.zhengzai.tv/
check
:
http://testpay.zhengzai.tv/order/verify
localUrl
:
http://kylin.zhengzai.tv/kylin/order/syncOrder
url-service
:
url
:
http://testservice.zhengzai.tv/
executor-main
:
xxl
:
admin
:
...
...
liquidnet-bus-config/liquidnet-config/liquidnet-client-job-prod.yml
0 → 100644
View file @
a03bc339
liquidnet
:
info
:
context
:
/
name
:
liquidnet-client-job
port
:
8090
logfile
:
name
:
client-job
path
:
./logs
mysql
:
database-name
:
prod_ln_clijob
\ No newline at end of file
liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-dev.yml
View file @
a03bc339
...
...
@@ -23,11 +23,11 @@ liquidnet:
sslEnabled
:
false
database
:
dev_ln_scene
url-pay
:
pay
:
http://testpay.zhengzai.tv
check
:
http://testpay.zhengzai.tv/order/verify
callback
:
http://devadam.zhengzai.tv/adam/member/order/callback
pay
:
${liquidnet.service.adam.url-pay.pay}
check
:
${liquidnet.service.adam.url-pay.check}
callback
:
${liquidnet.service.adam.url-pay.callback}
url-service
:
url
:
http://testservice.zhengzai.tv
url
:
${liquidnet.service.adam.url-service.url}
aliyun
:
accessKeyId
:
LTAI4FvoqxJUT5T1ydJSyhUn
accessSecret
:
WNCgFn9dSjnoDdej2YTvR0v0216WWU
...
...
liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-prod.yml
0 → 100644
View file @
a03bc339
liquidnet
:
system
:
updating
:
switch
:
false
info
:
port
:
9001
context
:
/adam
name
:
liquidnet-service-adam
logfile
:
path
:
./logs
name
:
service-adam
config
:
classpath:logback-spring.xml
file-max-size
:
200MB
pattern-file
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-console
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-rolling-file-name
:
${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
level
:
debug
rabbitmq
:
connection-timeout
:
3000
mysql
:
database-name
:
prod_ln_scene
mongodb
:
sslEnabled
:
false
database
:
prod_ln_scene
url-pay
:
pay
:
${liquidnet.service.adam.url-pay.pay}
check
:
${liquidnet.service.adam.url-pay.check}
callback
:
${liquidnet.service.adam.url-pay.callback}
url-service
:
url
:
${liquidnet.service.adam.url-service.url}
aliyun
:
accessKeyId
:
LTAI4FvoqxJUT5T1ydJSyhUn
accessSecret
:
WNCgFn9dSjnoDdej2YTvR0v0216WWU
#以下为spring各环境个性配置
liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml
View file @
a03bc339
...
...
@@ -23,11 +23,11 @@ liquidnet:
sslEnabled
:
false
database
:
test_ln_scene
url-pay
:
pay
:
http://testpay.zhengzai.tv
check
:
http://testpay.zhengzai.tv/order/verify
callback
:
http://adam.zhengzai.tv/adam/member/order/callback
pay
:
${liquidnet.service.adam.url-pay.pay}
check
:
${liquidnet.service.adam.url-pay.check}
callback
:
${liquidnet.service.adam.url-pay.callback}
url-service
:
url
:
http://testservice.zhengzai.tv
url
:
${liquidnet.service.adam.url-service.url}
aliyun
:
accessKeyId
:
LTAI4FvoqxJUT5T1ydJSyhUn
accessSecret
:
WNCgFn9dSjnoDdej2YTvR0v0216WWU
...
...
liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-prod.yml
0 → 100644
View file @
a03bc339
liquidnet
:
system
:
updating
:
switch
:
false
info
:
port
:
9999
context
:
# context: /service-consumer
name
:
liquidnet-service-consumer
logfile
:
path
:
./logs
name
:
service-consumer
config
:
classpath:logback-spring.xml
file-max-size
:
200MB
pattern-file
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-console
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-rolling-file-name
:
${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
level-root
:
debug
rabbitmq
:
connection-timeout
:
3000
mysql
:
database-name
:
prod_ln_scene
#以下为spring各环境个性配置
liquidnet-bus-config/liquidnet-config/liquidnet-service-executor-main-prod.yml
0 → 100644
View file @
a03bc339
liquidnet
:
info
:
port
:
8190
context
:
/service-executor-main
name
:
liquidnet-service-executor-main
logfile
:
path
:
./logs
name
:
service-executor-main
xxl
:
accessToken
:
qk52rqSejRBm9enf6BTTxw==
admin
:
# Job执行器注册地址,多个地址则用逗号分隔
# addresses: ${liquidnet.service.executor-main.xxl.admin.addresses}
addresses
:
${liquidnet.service.executor-main.xxl.admin.addresses}
executor
:
# Job执行器IP,默认为空表示自动获取IP,多网卡时手动指定
ip
:
# Job执行器端口,单机多个执行器端口号不能相同
port
:
8191
# Job执行器心跳注册分组依据,按需配置
appname
:
liquidnet-service-executor
# Job执行器运行日志,注意目录读写权限
logpath
:
./logs/job
liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-dev.yml
View file @
a03bc339
...
...
@@ -23,10 +23,10 @@ liquidnet:
sslEnabled
:
false
database
:
dev_ln_scene
url-pay
:
pay
:
http://testpay.zhengzai.tv/
check
:
http://testpay.zhengzai.tv/order/verify
localUrl
:
http://devkylin.zhengzai.tv/kylin/order/syncOrder
pay
:
${liquidnet.service.kylin.url-pay.pay}
check
:
${liquidnet.service.kylin.url-pay.check}
localUrl
:
${liquidnet.service.kylin.url-pay.callback}
url-service
:
url
:
http://testservice.zhengzai.tv/
url
:
${liquidnet.service.kylin.url-service.url}
al-oss
:
imgUrl
:
"
https://img.zhengzai.tv/"
liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-prod.yml
0 → 100644
View file @
a03bc339
liquidnet
:
system
:
updating
:
switch
:
false
info
:
port
:
9002
context
:
/kylin
name
:
liquidnet-service-kylin
logfile
:
path
:
./logs
name
:
service-kylin
config
:
classpath:logback-spring.xml
file-max-size
:
200MB
pattern-file
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-console
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-rolling-file-name
:
${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
level-root
:
info
rabbitmq
:
connection-timeout
:
3000
mysql
:
database-name
:
prod_ln_scene
mongodb
:
sslEnabled
:
false
database
:
prod_ln_scene
url-pay
:
pay
:
${liquidnet.service.kylin.url-pay.pay}
check
:
${liquidnet.service.kylin.url-pay.check}
localUrl
:
${liquidnet.service.kylin.url-pay.callback}
url-service
:
url
:
${liquidnet.service.kylin.url-service.url}
al-oss
:
imgUrl
:
"
https://img.zhengzai.tv/"
liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml
View file @
a03bc339
...
...
@@ -23,10 +23,10 @@ liquidnet:
sslEnabled
:
false
database
:
test_ln_scene
url-pay
:
pay
:
http://testpay.zhengzai.tv/
check
:
http://testpay.zhengzai.tv/order/verify
localUrl
:
http://kylin.zhengzai.tv/kylin/order/syncOrder
pay
:
${liquidnet.service.kylin.url-pay.pay}
check
:
${liquidnet.service.kylin.url-pay.check}
localUrl
:
${liquidnet.service.kylin.url-pay.callback}
url-service
:
url
:
http://testservice.zhengzai.tv/
url
:
${liquidnet.service.kylin.url-service.url}
al-oss
:
imgUrl
:
"
https://img.zhengzai.tv/"
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @
a03bc339
...
...
@@ -278,7 +278,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
if
(
isTrueName
==
1
)
{
currentTime
=
System
.
currentTimeMillis
();
for
(
String
enterId
:
payOrderParam
.
getEnterIdList
())
{
AdamEntersVo
adamEnters
=
orderUtils
.
getEnters
(
uid
,
enterId
);
//feignAdamBaseClient.queryEnters(enterId, uid).getData();
AdamEntersVo
adamEnters
=
orderUtils
.
getEnters
(
uid
,
enterId
);
//feignAdamBaseClient.queryEnters(enterId, uid).getData();
entersVoList
.
add
(
adamEnters
);
if
(
isStudent
==
1
)
{
int
age
=
IDCard
.
getAgeByIdCard
(
adamEnters
.
getIdCard
());
...
...
@@ -379,7 +379,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
orderTickets
.
setTimePay
(
null
);
if
(
payOrderParam
.
getIsExpress
()
==
1
)
{
currentTime
=
System
.
currentTimeMillis
();
AdamAddressesVo
addressesVo
=
orderUtils
.
getAddress
(
uid
,
payOrderParam
.
getAddressId
());
//feignAdamBaseClient.queryAddresses(payOrderParam.getAddressId(), uid).getData();
AdamAddressesVo
addressesVo
=
orderUtils
.
getAddress
(
uid
,
payOrderParam
.
getAddressId
());
//feignAdamBaseClient.queryAddresses(payOrderParam.getAddressId(), uid).getData();
orderTickets
.
setExpressContacts
(
addressesVo
.
getName
());
orderTickets
.
setExpressAddress
(
addressesVo
.
getAddress
());
orderTickets
.
setExpressPhone
(
addressesVo
.
getPhone
());
...
...
@@ -685,8 +685,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
httpData
.
add
(
"open_id"
,
payAgainParam
.
getOpenId
());
if
(
payAgainParam
.
getPayType
().
equals
(
"alipay"
)
&&
payAgainParam
.
getDeviceFrom
().
equals
(
"wap"
))
{
httpData
.
add
(
"show_url"
,
payAgainParam
.
getShowUrl
());
httpData
.
add
(
"return_url"
,
payAgainParam
.
getReturnUrl
());
httpData
.
add
(
"show_url"
,
payAgainParam
.
getShowUrl
()
+
payAgainParam
.
getOrderId
()
);
httpData
.
add
(
"return_url"
,
payAgainParam
.
getReturnUrl
()
+
payAgainParam
.
getOrderId
()
);
}
String
returnData
=
HttpUtil
.
post
(
payUrl
+
payAgainParam
.
getDeviceFrom
()
+
"/"
+
payAgainParam
.
getPayType
(),
httpData
);
...
...
@@ -787,11 +787,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
KylinOrderTicketStatus
orderTicketStatus
=
new
KylinOrderTicketStatus
();
KylinOrderTicketEntities
orderTicketEntities
=
new
KylinOrderTicketEntities
();
if
(
orderTicketData
.
getStatus
()==
2
)
{
if
(
orderTicketData
.
getStatus
()
==
2
)
{
orderRefundsCallbackService
.
refundApply
(
orderTicketData
.
getOrderTicketsId
());
}
else
if
(
orderTicketData
.
getStatus
()==
3
||
orderTicketData
.
getStatus
()==
4
)
{
log
.
error
(
"订单号位 {} 的订单正在退款 或者已退款"
,
syncOrderParam
.
getOrder_code
());
}
else
{
}
else
if
(
orderTicketData
.
getStatus
()
==
3
||
orderTicketData
.
getStatus
()
==
4
)
{
log
.
error
(
"订单号位 {} 的订单正在退款 或者已退款"
,
syncOrderParam
.
getOrder_code
());
}
else
{
orderTickets
.
setOrderTicketsId
(
orderTicketData
.
getOrderTicketsId
());
orderTickets
.
setPaymentType
(
syncOrderParam
.
getPayment_type
());
orderTickets
.
setPayCode
(
syncOrderParam
.
getCode
());
...
...
@@ -912,7 +912,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
item
.
setKuaidi_status
(-
2
);
}
if
(
item
.
getStatus
()
==
KylinTableStatusConst
.
ORDER_STATUS0
)
{
if
(
item
.
getStatus
()
.
equals
(
KylinTableStatusConst
.
ORDER_STATUS0
)
)
{
item
.
setRestTime
(
DateUtil
.
intervalSeconds
(
DateUtil
.
parse
(
item
.
getOverdueAt
(),
"yyyy-MM-dd HH:mm:ss"
),
DateUtil
.
parse
(
DateUtil
.
getNowTime
(),
"yyyy-MM-dd HH:mm:ss"
)
...
...
@@ -1136,9 +1136,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
String
uid
=
CurrentUtil
.
getCurrentUid
();
List
<
KylinOrderListVo
>
voList
=
dataUtils
.
getOrderList
(
uid
);
Integer
unPayCount
=
0
;
for
(
KylinOrderListVo
item
:
voList
)
{
if
(
item
.
getStatus
()==
0
)
{
unPayCount
+=
1
;
for
(
KylinOrderListVo
item
:
voList
)
{
if
(
item
.
getStatus
()
==
0
)
{
unPayCount
+=
1
;
}
}
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java
View file @
a03bc339
...
...
@@ -109,15 +109,12 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
// 无 performancesId 则 创建
if
(
null
==
step1Param
.
getPerformancesId
())
{
result
=
createStep1
(
step1Param
);
log
.
info
(
" PERFORMANCE 演出第一步 创建"
);
}
else
{
// 获取 create 数据 status = 0 或 无数据 创建
PerformancePartnerVo
createParam
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"performancesId"
).
is
(
step1Param
.
getPerformancesId
())),
PerformancePartnerVo
.
class
,
PerformancePartnerVo
.
class
.
getSimpleName
());
if
(
createParam
==
null
)
{
result
=
createStep1
(
step1Param
);
log
.
info
(
" PERFORMANCE 演出第一步 创建"
);
}
else
{
// 修改
result
=
updateStep1
(
step1Param
);
log
.
info
(
" PERFORMANCE 演出第一步 修改"
);
}
}
return
result
;
...
...
@@ -217,7 +214,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
if
(
data
==
null
)
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
20104
));
}
log
.
info
(
" PERFORMANCE 演出第一步 获取"
);
return
ResponseDto
.
success
(
data
);
}
...
...
@@ -230,10 +226,8 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
KylinPerformanceStatus
performanceStatus
=
performanceStatusMapper
.
selectOne
(
new
UpdateWrapper
<
KylinPerformanceStatus
>().
eq
(
"performance_id"
,
step2Param
.
getPerformancesId
()));
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
)
{
// 修改
result
=
updateStep2
(
step2Param
);
log
.
info
(
" PERFORMANCE 演出第二步 修改"
);
}
else
if
(
performanceStatus
.
getStatus
()
==
10
){
result
=
ResponseDto
.
success
(
"演出已结束不可修改"
);
}
...
...
@@ -461,7 +455,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
PerformanceStep2Param
performanceStep2Param
=
new
PerformanceStep2Param
();
BeanUtils
.
copyProperties
(
data
,
performanceStep2Param
);
performanceStep2Param
.
setTicketTimes
(
ticketTimesTicketCreatePartnerVoList
);
log
.
info
(
" PERFORMANCE 演出第二步 获取"
);
return
ResponseDto
.
success
(
performanceStep2Param
);
}
...
...
@@ -583,7 +576,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
int
size
=
performancePartnerListParam
.
getSize
();
PageInfo
<
PerformancePartnerListDao
>
pageInfoTmp
=
null
;
if
(
status
==
0
)
{
//未发布演出
log
.
info
(
" PERFORMANCE 演出列表 未提交"
);
// 排序 分页
Pageable
pageable
=
PageRequest
.
of
(
page
,
size
,
Sort
.
by
(
Sort
.
Direction
.
DESC
,
"createdAt"
));
//条件
...
...
@@ -606,7 +598,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
pageInfoTmp
=
new
PageInfo
(
voList
);
pageInfoTmp
.
setTotal
(
count
);
}
else
{
//演出列表
log
.
info
(
" PERFORMANCE 演出列表 已提交"
);
try
{
PageHelper
.
startPage
(
performancePartnerListParam
.
getPage
(),
performancePartnerListParam
.
getSize
());
List
<
PerformancePartnerListDao
>
voList
=
performancesMapper
.
partnerPerformanceList
(
BeanUtil
.
convertBeanToMap
(
performancePartnerListParam
));
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketTimesPartnerServiceImpl.java
View file @
a03bc339
...
...
@@ -66,15 +66,12 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
new
UpdateWrapper
<
KylinPerformanceStatus
>().
eq
(
"performance_id"
,
createTicketTimesParam
.
getPerformancesId
()));
if
(
null
==
performanceStatus
)
{
ticketTimesPartnerVo
=
createTimes
(
createTicketTimesParam
);
log
.
info
(
" PERFORMANCE 场次 创建"
);
}
else
if
(
performanceStatus
.
getAuditStatus
()==
0
){
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
20101
));
}
else
if
(
performanceStatus
.
getStatus
()
>=
3
&&
performanceStatus
.
getStatus
()
!=
4
)
{
//未被拒绝 且 通过审核的演出
ticketTimesPartnerVo
=
addNewTimes
(
createTicketTimesParam
);
log
.
info
(
" PERFORMANCE 场次 新增"
);
}
else
{
ticketTimesPartnerVo
=
createTimes
(
createTicketTimesParam
);
log
.
info
(
" PERFORMANCE 场次 创建"
);
}
return
ticketTimesPartnerVo
;
}
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @
a03bc339
...
...
@@ -78,17 +78,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
new
UpdateWrapper
<
KylinPerformanceStatus
>().
eq
(
"performance_id"
,
timesPartnerVo
.
getPerformancesId
()));
if
(
null
==
performanceStatus
)
{
ticketPartnerVo
=
createTicket
(
ticketCreateParam
);
log
.
info
(
" PERFORMANCE 票 创建"
);
}
else
if
(
performanceStatus
.
getStatus
()
>=
3
&&
performanceStatus
.
getStatus
()
!=
4
)
{
//未被拒绝 且 通过审核的演出
ticketPartnerVo
=
addNewTicket
(
ticketCreateParam
);
log
.
info
(
" PERFORMANCE 票 添加"
);
}
else
{
ticketPartnerVo
=
createTicket
(
ticketCreateParam
);
log
.
info
(
" PERFORMANCE 票 创建"
);
}
}
else
{
ticketPartnerVo
=
createTicket
(
ticketCreateParam
);
log
.
info
(
" PERFORMANCE 票 创建"
);
}
return
ticketPartnerVo
;
}
...
...
@@ -200,7 +196,6 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
@Override
public
ResponseDto
<
KylinTicketPartnerVo
>
updateTicket
(
TicketCreateParam
ticketCreateParam
)
{
log
.
info
(
"票 修改"
);
try
{
KylinTicketTimesPartnerVo
ticketTimeRelation
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"ticketTimesId"
).
is
(
ticketCreateParam
.
getTimesId
())),
KylinTicketTimesPartnerVo
.
class
,
KylinTicketTimesPartnerVo
.
class
.
getSimpleName
());
...
...
@@ -253,7 +248,6 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
@Override
public
ResponseDto
<
String
>
deleteTicket
(
String
ticketsId
)
{
log
.
info
(
"票 删除"
);
try
{
LocalDateTime
updatedAt
=
LocalDateTime
.
now
();
...
...
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