记得上下班打卡 | 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
ff77f97e
Commit
ff77f97e
authored
Jun 24, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
f7218f5d
b375b160
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
144 additions
and
83 deletions
+144
-83
PerformanceExpressSearchAdminParam.java
...e/kylin/dto/param/PerformanceExpressSearchAdminParam.java
+5
-1
performanceOrderList.html
...ngzai/kylin/performancesExpress/performanceOrderList.html
+36
-12
performancesList.html
.../zhengzai/kylin/performancesExpress/performancesList.html
+1
-1
PerformancesExpressServiceImpl.java
...ai/kylin/service/impl/PerformancesExpressServiceImpl.java
+0
-2
UserPathDto.java
...src/main/java/com/liquidnet/service/base/UserPathDto.java
+10
-9
PerformanceExpressPerformanceOrderListAdminDao.java
...n/dao/PerformanceExpressPerformanceOrderListAdminDao.java
+11
-16
KylinOrderTicketsMapper.xml
...iquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
+3
-4
KylinPerformancesMapper.xml
...iquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
+2
-2
db_ln_adam_initialdata.sql
...quidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql
+25
-25
AdamDMAdminController.java
.../service/adam/controller/admin/AdamDMAdminController.java
+10
-10
KylinPerformancesServiceImpl.java
...vice/kylin/service/impl/KylinPerformancesServiceImpl.java
+22
-1
PerformanceVoTask.java
.../liquidnet/service/kylin/timerTask/PerformanceVoTask.java
+19
-0
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceExpressSearchAdminParam.java
View file @
ff77f97e
...
...
@@ -16,8 +16,12 @@ public class PerformanceExpressSearchAdminParam {
// 订单搜索
private
String
orderCode
;
private
String
orderTicketsId
;
private
String
userMobile
;
private
String
orderStatus
;
private
String
userMobile
;
private
String
expressStatus
;
private
String
expressContacts
;
private
String
expressPhone
;
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html
View file @
ff77f97e
...
...
@@ -27,6 +27,14 @@
<label>
购买人姓名:
</label>
<input
type=
"text"
name=
"userName"
/>
</li>
<li>
<label>
收货人电话:
</label>
<input
type=
"text"
name=
"expressContacts"
/>
</li>
<li>
<label>
收货人姓名:
</label>
<input
type=
"text"
name=
"expressPhone"
/>
</li>
<li>
<label>
订单状态:
</label>
<select
name=
"orderStatus"
th:with=
"type=${@dict.getType('zhengzai_order_status')}"
>
...
...
@@ -87,24 +95,40 @@
}
},
{
field
:
'priceActual'
,
title
:
'总价格'
},
{
field
:
'number'
,
title
:
'购票量'
field
:
'priceExpress'
,
title
:
'快递费'
},
{
field
:
'userId'
,
title
:
'用户ID'
field
:
''
,
title
:
'快递方式'
,
formatter
:
function
(
value
,
row
,
index
)
{
if
(
row
.
expressType
==
1
)
{
return
"寄付"
;
}
else
{
return
"到付"
;
}
}
},
{
field
:
'userMobile'
,
title
:
'账户名'
field
:
''
,
title
:
'购买用户'
,
formatter
:
function
(
value
,
row
,
index
)
{
var
userId
=
row
.
userId
;
var
userMobile
=
row
.
userMobile
;
var
userName
=
row
.
userName
;
return
'ID:'
+
userId
+
'<br>'
+
'姓名:'
+
userName
+
'<br>'
+
'手机号:'
+
userMobile
;
}
},
{
field
:
'userMobile'
,
title
:
'手机号'
field
:
''
,
title
:
'收获用户'
,
formatter
:
function
(
value
,
row
,
index
)
{
console
.
log
(
row
)
var
expressContacts
=
row
.
expressContacts
;
var
expressAddress
=
row
.
expressAddress
;
var
expressPhone
=
row
.
expressPhone
;
return
'姓名:'
+
expressContacts
+
'<br>'
+
'手机号:'
+
expressPhone
+
'<br>'
+
'地址:'
+
expressPhone
;
}
},
{
title
:
'操作'
,
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performancesList.html
View file @
ff77f97e
...
...
@@ -16,7 +16,7 @@
</li>
<li>
<label>
演出ID:
</label>
<input
type=
"text"
name=
"performanceId"
/>
<input
type=
"text"
name=
"performance
s
Id"
/>
</li>
<li>
<a
class=
"btn btn-primary btn-rounded btn-sm"
onclick=
"$.table.search()"
><i
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java
View file @
ff77f97e
...
...
@@ -41,7 +41,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinPerformance
Map
<
String
,
Object
>
map
=
BeanUtil
.
convertBeanToMap
(
performanceExpressSearchAdminParam
);
voList
=
performancesMapper
.
performanceExpressPerformanceList
(
map
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
null
;
}
return
voList
;
...
...
@@ -53,7 +52,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinPerformance
Map
<
String
,
Object
>
map
=
BeanUtil
.
convertBeanToMap
(
performanceExpressSearchAdminParam
);
voList
=
kylinOrderTicketsMapper
.
performanceExpressPerformanceOrderList
(
map
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
null
;
}
return
voList
;
...
...
liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/UserPathDto.java
View file @
ff77f97e
...
...
@@ -15,32 +15,33 @@ public class UserPathDto implements Serializable {
private
static
UserPathDto
instance
=
new
UserPathDto
();
private
static
final
long
serialVersionUID
=
-
4153353929914805750L
;
private
String
tag
;
private
String
uid
;
// private String tag;
// private String uid;
// private String ip;
private
String
token
;
private
String
time
;
//yyyyMMddHHmmssSSS
private
String
interfaceName
;
private
String
params
;
private
String
result
;
private
String
ip
;
private
String
userAgent
;
private
UserPathDto
()
{}
private
UserPathDto
()
{
}
private
static
UserPathDto
getInstance
()
{
return
instance
;
}
public
static
String
setData
(
String
interfaceName
,
Object
params
,
Object
result
)
{
instance
.
tag
=
"MDSKY.NOW.ELK"
;
instance
.
uid
=
CurrentUtil
.
getCurrentUid
()
==
null
?
"UID"
:
CurrentUtil
.
getCurrentUid
();
// instance.tag = "MDSKY.NOW.ELK";
// instance.ip = CurrentUtil.getCliIpAddr();
String
uid
=
CurrentUtil
.
getCurrentUid
()
==
null
?
"UID"
:
CurrentUtil
.
getCurrentUid
();
instance
.
token
=
CurrentUtil
.
getToken
()
==
null
?
"TOKEN"
:
CurrentUtil
.
getToken
();
instance
.
time
=
DateUtil
.
Formatter
.
yyyyMMddHHmmssSSSUnTrim
.
format
(
LocalDateTime
.
now
());
instance
.
interfaceName
=
interfaceName
;
instance
.
params
=
params
.
toString
().
equals
(
""
)
?
"NanParams"
:
params
.
toString
();
instance
.
result
=
result
.
toString
().
equals
(
""
)
?
"NanResults"
:
result
.
toString
();;
instance
.
ip
=
CurrentUtil
.
getCliIpAddr
();
instance
.
result
=
result
.
toString
().
equals
(
""
)
?
"NanResults"
:
result
.
toString
();
instance
.
userAgent
=
ServletUtils
.
getRequest
().
getHeader
(
"User-Agent"
);
return
JsonUtils
.
toJson
(
instance
);
return
"MDSKY.NOW.ELK."
+
uid
==
"UID"
?
CurrentUtil
.
getCliIpAddr
()
:
uid
+
" = "
+
JsonUtils
.
toJson
(
instance
);
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceExpressPerformanceOrderListAdminDao.java
View file @
ff77f97e
...
...
@@ -2,29 +2,24 @@ package com.liquidnet.service.kylin.dao;
import
lombok.Data
;
import
java.math.BigDecimal
;
@Data
public
class
PerformanceExpressPerformanceOrderListAdminDao
{
String
orderTicketsId
;
String
sponsor
;
String
orderCode
;
String
title
;
String
status
;
String
getTicketType
;
String
payType
;
String
paymentType
;
String
tied
;
String
price
;
String
number
;
String
priceMember
;
String
priceTotal
;
String
priceVoucher
;
String
priceActual
;
String
priceExpress
;
String
priceRefund
;
String
refundNumber
;
Integer
status
;
BigDecimal
priceExpress
;
String
userId
;
String
userName
;
String
userMobile
;
String
express_contacts
;
String
express_address
;
String
express_phone
;
Integer
expressType
;
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @
ff77f97e
...
...
@@ -219,7 +219,7 @@
kot.express_address,
kot.express_phone,
kots.status
kots.status
,
kots.express_type
FROM kylin_order_tickets kot
...
...
@@ -232,14 +232,13 @@
AND kots.pay_status = 1
<if
test=
"orderCode != null and orderCode != ''"
>
AND kot.order_code = #{orderCode}
</if>
<if
test=
"orderTicketsId != null and orderTicketsId != ''"
>
AND kot.order_tickets_id = #{orderTicketsId}
</if>
<if
test=
"orderStatus!=null and orderStatus!=''"
>
AND kots.status = #{orderStatus}
</if>
<if
test=
"userMobile != null and userMobile != ''"
>
AND kot.user_mobile = #{userMobile}
</if>
<if
test=
"userName != null and userName != ''"
>
AND kot.user_name like concat('%', #{userName}, '%')
</if>
<if
test=
"orderCode != null and orderCode != ''"
>
AND kot.order_code = #{orderCode}
</if>
<if
test=
"expressContacts != null and expressContacts != ''"
>
AND kot.express_contacts = #{expressContacts}
</if>
<if
test=
"expressContacts != null and expressContacts != ''"
>
AND kot.express_contacts = like concat('%', #{expressContacts}, '%')
</if>
<if
test=
"expressPhone != null and expressPhone != ''"
>
AND kot.express_phone = #{expressPhone}
</if>
<if
test=
"orderStatus!=null and orderStatus!=''"
>
AND kots.status = #{orderStatus}
</if>
</where>
</select>
</mapper>
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
View file @
ff77f97e
...
...
@@ -463,8 +463,8 @@
<if
test=
"title!=''"
>
AND title LIKE concat('%', #{title}, '%')
</if>
<if
test=
"performanceId!=''"
>
AND performance
_id = #{performance
Id}
<if
test=
"performance
s
Id!=''"
>
AND performance
s_id = #{performances
Id}
</if>
</where>
ORDER BY created_at DESC
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql
View file @
ff77f97e
...
...
@@ -8,7 +8,7 @@ create table adam_third_party
uid
varchar
(
64
)
default
''
,
open_id
varchar
(
64
)
comment
'第三方ID'
,
avatar
varchar
(
255
)
comment
'第三方头像'
,
nickname
varchar
(
64
)
comment
'第三方昵称'
,
nickname
varchar
(
100
)
comment
'第三方昵称'
,
platform
varchar
(
20
)
comment
'平台名称'
,
state
tinyint
comment
'0-INIT,1-NORMAL,2-INVALID'
,
created_at
datetime
not
null
,
...
...
@@ -62,8 +62,8 @@ create table adam_user_info
(
mid
bigint
unsigned
auto_increment
primary
key
,
uid
varchar
(
64
)
not
null
,
nickname
varchar
(
32
)
comment
'昵称'
,
sex
varchar
(
5
0
)
comment
'性别'
,
nickname
varchar
(
100
)
comment
'昵称'
,
sex
varchar
(
6
0
)
comment
'性别'
,
birthday
date
comment
'生日YYYY-MM-DD'
,
area
varchar
(
100
)
comment
'常住地/区域'
,
signature
varchar
(
255
)
comment
'个性签名'
,
...
...
@@ -86,8 +86,8 @@ create table adam_real_name
real_name_id
varchar
(
64
)
not
null
,
uid
varchar
(
64
)
not
null
,
type
enum
(
'1'
,
'2'
,
'3'
,
'4'
,
'5'
)
not
null
default
'1'
comment
'1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证'
,
name
varchar
(
3
0
)
not
null
comment
'真实姓名'
,
id_card
varchar
(
5
0
)
not
null
comment
'证件号码'
,
name
varchar
(
6
0
)
not
null
comment
'真实姓名'
,
id_card
varchar
(
3
0
)
not
null
comment
'证件号码'
,
state
tinyint
not
null
comment
'0-INIT,1-NORMAL,2-INVALID'
,
created_at
datetime
(
3
)
not
null
,
updated_at
datetime
(
3
),
...
...
@@ -107,9 +107,9 @@ create table adam_enters
enters_id
varchar
(
64
)
not
null
,
uid
varchar
(
64
)
not
null
comment
'用户id'
,
type
tinyint
not
null
default
'1'
comment
'1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证'
,
name
varchar
(
5
0
)
not
null
default
''
comment
'入场人名称'
,
name
varchar
(
6
0
)
not
null
default
''
comment
'入场人名称'
,
mobile
varchar
(
20
)
not
null
default
''
comment
'入场人手机号'
,
id_card
varchar
(
2
0
)
not
null
default
''
comment
'入场人身份号码,或护照号码'
,
id_card
varchar
(
3
0
)
not
null
default
''
comment
'入场人身份号码,或护照号码'
,
is_default
boolean
not
null
default
false
comment
'是否为默认:0-否,1-是,第一个入默认1'
,
state
tinyint
not
null
comment
'状态:0-INIT,1-NORMAL,2-INVALID'
,
created_at
datetime
(
3
)
not
null
,
...
...
@@ -130,10 +130,10 @@ create table adam_addresses
uid
varchar
(
64
)
not
null
,
name
varchar
(
120
)
not
null
comment
'姓名'
,
phone
varchar
(
30
)
not
null
comment
'手机号'
,
province
varchar
(
3
0
)
not
null
comment
'省份'
,
city
varchar
(
5
0
)
not
null
comment
'城市'
,
province
varchar
(
6
0
)
not
null
comment
'省份'
,
city
varchar
(
6
0
)
not
null
comment
'城市'
,
county
varchar
(
60
)
not
null
comment
'区县'
,
address
varchar
(
750
)
not
null
comment
'详细地址'
,
address
tinytext
not
null
comment
'详细地址'
,
is_default
boolean
not
null
default
false
comment
'是否为默认:0-否,1-是,第一个默认1'
,
state
tinyint
not
null
comment
'状态:0-INIT,1-NORMAL,2-INVALID'
,
created_at
datetime
(
3
)
not
null
,
...
...
@@ -207,7 +207,7 @@ create table adam_member
(
mid
bigint
unsigned
auto_increment
primary
key
,
member_id
varchar
(
255
)
comment
'会员id'
,
name
varchar
(
64
),
name
varchar
(
80
),
title
varchar
(
100
),
sub_title
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'副标题'
,
icon
varchar
(
255
),
...
...
@@ -227,7 +227,7 @@ create table adam_member
state
int
NOT
NULL
COMMENT
'状态:1-NORMAL,2-INVALID'
,
limitation
int
default
0
comment
'限购数量,0不限购'
,
comment
text
);
)
engine
=
InnoDB
comment
'会员卡信息'
;
create
unique
index
uidx_amember_id
on
adam_member
(
member_id
);
#
MDB
.
idx
:
member_id
,
state
...
...
@@ -237,17 +237,17 @@ create table adam_member_price
(
mid
bigint
unsigned
auto_increment
primary
key
,
member_price_id
varchar
(
64
)
comment
'会员价格id'
,
member_id
varchar
(
64
)
NOT
NULL
comment
'会员种类ID'
,
state
tinyint
NOT
NULL
DEFAULT
'0'
COMMENT
'0不可用、1上线中、2已下线'
,
name
varchar
(
30
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_unicode_ci
NOT
NULL
DEFAULT
''
COMMENT
'会员包名称'
,
price
decimal
(
8
,
2
)
NOT
NULL
DEFAULT
'0.00'
COMMENT
'会员包价格'
,
member_id
varchar
(
64
)
NOT
NULL
comment
'会员种类ID'
,
state
tinyint
NOT
NULL
DEFAULT
'0'
COMMENT
'0不可用、1上线中、2已下线'
,
name
varchar
(
80
)
NOT
NULL
DEFAULT
''
COMMENT
'会员包名称'
,
price
decimal
(
8
,
2
)
NOT
NULL
DEFAULT
'0.00'
COMMENT
'会员包价格'
,
price_fixed
decimal
(
8
,
2
)
comment
'折扣价'
,
days
int
NOT
NULL
DEFAULT
'0'
COMMENT
'会员包天数'
,
detail
text
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_unicode_ci
NOT
NULL
COMMENT
'会员包须知'
,
days
int
NOT
NULL
DEFAULT
'0'
COMMENT
'会员包天数'
,
detail
text
NOT
NULL
COMMENT
'会员包须知'
,
created_at
datetime
(
3
),
updated_at
datetime
(
3
),
comment
text
);
)
engine
=
InnoDB
comment
'会员卡价格'
;
create
unique
index
uidx_amember_price_id
on
adam_member_price
(
member_price_id
);
create
index
idx_amember_price_member_id
on
adam_member_price
(
member_id
);
...
...
@@ -262,7 +262,7 @@ create table adam_member_order
mode
tinyint
comment
'购买方式:0-购买会员,1-购买会员码'
,
price
decimal
(
8
,
2
)
comment
'原价'
,
price_paid
decimal
(
8
,
2
)
comment
'实际支付'
,
member_name
varchar
(
64
),
member_name
varchar
(
80
),
member_id
varchar
(
255
)
comment
'会员id'
,
member_price_id
varchar
(
255
)
comment
'会员价格id'
,
days
int
default
0
comment
'购买天数'
,
...
...
@@ -276,10 +276,10 @@ create table adam_member_order
created_at
datetime
(
3
),
updated_at
datetime
(
3
),
client_ip
varchar
(
50
),
source
varchar
(
2
0
),
version
varchar
(
2
0
),
source
varchar
(
3
0
),
version
varchar
(
3
0
),
comment
text
);
)
engine
=
InnoDB
comment
'用户会员订单'
;
create
unique
index
uidx_amember_order_id
on
adam_member_order
(
order_no
);
#
MDB
.
idx
:
order_no
...
...
@@ -296,7 +296,7 @@ create table adam_user_member
created_at
datetime
(
3
),
updated_at
datetime
(
3
),
comment
text
);
)
engine
=
InnoDB
comment
'用户会员信息'
;
create
index
idx_auser_member_uid
on
adam_user_member
(
uid
);
create
index
idx_auser_member_no
on
adam_user_member
(
member_no
);
...
...
@@ -321,7 +321,7 @@ create table adam_member_code
use_uid
varchar
(
64
)
default
null
comment
'消费用户ID'
,
use_at
datetime
(
3
)
default
null
,
comment
text
);
)
engine
=
InnoDB
comment
'会员兑换码'
;
create
unique
index
uidx_amember_code_id
on
adam_member_code
(
code
);
#
MDB
.
idx
:
code
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamDMAdminController.java
View file @
ff77f97e
...
...
@@ -42,7 +42,7 @@ public class AdamDMAdminController extends AdamBaseController {
@Autowired
DMCollectionProcessor
dmCollectionProcessor
;
@ApiOperationSupport
(
order
=
1
)
@ApiOperationSupport
(
order
=
1
0
)
@ApiOperation
(
value
=
"user"
)
@GetMapping
(
value
=
{
"user"
})
public
ResponseDto
<
Object
>
dataMigrationForUser
()
{
...
...
@@ -50,7 +50,7 @@ public class AdamDMAdminController extends AdamBaseController {
return
ResponseDto
.
success
();
}
@ApiOperationSupport
(
order
=
2
)
@ApiOperationSupport
(
order
=
2
0
)
@ApiOperation
(
value
=
"tpa"
)
@GetMapping
(
value
=
{
"tpa"
})
public
ResponseDto
<
Object
>
dataMigrationForTpa
()
{
...
...
@@ -58,7 +58,7 @@ public class AdamDMAdminController extends AdamBaseController {
return
ResponseDto
.
success
();
}
@ApiOperationSupport
(
order
=
3
)
@ApiOperationSupport
(
order
=
3
0
)
@ApiOperation
(
value
=
"real"
)
@GetMapping
(
value
=
{
"real"
})
public
ResponseDto
<
Object
>
dataMigrationForReal
()
{
...
...
@@ -66,7 +66,7 @@ public class AdamDMAdminController extends AdamBaseController {
return
ResponseDto
.
success
();
}
@ApiOperationSupport
(
order
=
4
)
@ApiOperationSupport
(
order
=
4
0
)
@ApiOperation
(
value
=
"vip"
)
@GetMapping
(
value
=
{
"vip"
})
public
ResponseDto
<
Object
>
dataMigrationForVip
()
{
...
...
@@ -74,7 +74,7 @@ public class AdamDMAdminController extends AdamBaseController {
return
ResponseDto
.
success
();
}
@ApiOperationSupport
(
order
=
5
)
@ApiOperationSupport
(
order
=
5
0
)
@ApiOperation
(
value
=
"traces"
)
@GetMapping
(
value
=
{
"traces"
})
public
ResponseDto
<
Object
>
dataMigrationForTraces
()
{
...
...
@@ -82,7 +82,7 @@ public class AdamDMAdminController extends AdamBaseController {
return
ResponseDto
.
success
();
}
@ApiOperationSupport
(
order
=
6
)
@ApiOperationSupport
(
order
=
6
0
)
@ApiOperation
(
value
=
"enters"
)
@GetMapping
(
value
=
{
"enters"
})
public
ResponseDto
<
Object
>
dataMigrationForEnters
()
{
...
...
@@ -90,7 +90,7 @@ public class AdamDMAdminController extends AdamBaseController {
return
ResponseDto
.
success
();
}
@ApiOperationSupport
(
order
=
7
)
@ApiOperationSupport
(
order
=
7
0
)
@ApiOperation
(
value
=
"addr"
)
@GetMapping
(
value
=
{
"addr"
})
public
ResponseDto
<
Object
>
dataMigrationForAddr
()
{
...
...
@@ -98,7 +98,7 @@ public class AdamDMAdminController extends AdamBaseController {
return
ResponseDto
.
success
();
}
@ApiOperationSupport
(
order
=
8
)
@ApiOperationSupport
(
order
=
8
0
)
@ApiOperation
(
value
=
"morder"
)
@GetMapping
(
value
=
{
"morder"
})
public
ResponseDto
<
Object
>
dataMigrationForMOrder
()
{
...
...
@@ -106,7 +106,7 @@ public class AdamDMAdminController extends AdamBaseController {
return
ResponseDto
.
success
();
}
@ApiOperationSupport
(
order
=
9
)
@ApiOperationSupport
(
order
=
9
0
)
@ApiOperation
(
value
=
"mcode"
)
@GetMapping
(
value
=
{
"mcode"
})
public
ResponseDto
<
Object
>
dataMigrationForMCode
()
{
...
...
@@ -114,7 +114,7 @@ public class AdamDMAdminController extends AdamBaseController {
return
ResponseDto
.
success
();
}
@ApiOperationSupport
(
order
=
10
)
@ApiOperationSupport
(
order
=
10
0
)
@ApiOperation
(
value
=
"collect"
)
@GetMapping
(
value
=
{
"collect"
})
public
ResponseDto
<
Object
>
dataMigrationForCollect
()
{
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @
ff77f97e
...
...
@@ -308,7 +308,28 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
List
<
KylinPerformanceVo
>
list
=
mongoTemplate
.
find
(
query
,
KylinPerformanceVo
.
class
,
KylinPerformanceVo
.
class
.
getSimpleName
());
list
=
checkAppStatus
(
list
);
// list = checkAppStatus(list);
if
(!
CollectionUtils
.
isEmpty
(
list
))
{
String
nowTimeStr
=
DateUtil
.
getNowTime
();
for
(
KylinPerformanceVo
info
:
list
)
{
Integer
isEnd
=
DateUtil
.
compareStrDay
(
nowTimeStr
,
info
.
getTimeEnd
());
if
(
7
!=
info
.
getAppStatus
()
&&
3
!=
info
.
getAppStatus
()
&&
1
!=
isEnd
)
{
// 演出已结束或者未上线
String
timeStart
=
info
.
getSellTime
();
String
timeEnd
=
info
.
getStopSellTime
();
if
(
info
.
getAppStatus
()
!=
8
)
{
if
(
1
==
DateUtil
.
compareStrDay
(
timeStart
,
nowTimeStr
))
{
// 未开始
info
.
setAppStatus
(
9
);
}
else
{
// 已开始
info
.
setAppStatus
(
6
);
if
(
1
==
DateUtil
.
compareStrDay
(
nowTimeStr
,
timeEnd
))
{
// 已结束
info
.
setAppStatus
(
10
);
}
}
}
}
}
}
HashMap
info
=
new
HashMap
();
info
.
put
(
"total"
,
count
);
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java
View file @
ff77f97e
...
...
@@ -20,6 +20,8 @@ import com.liquidnet.service.kylin.utils.MongoVoUtils;
import
com.mongodb.BasicDBObject
;
import
com.mongodb.client.model.FindOneAndUpdateOptions
;
import
com.mongodb.client.model.ReturnDocument
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.XSlf4j
;
import
org.bson.Document
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -38,6 +40,7 @@ import java.util.HashMap;
import
java.util.List
;
@Component
@Slf4j
public
class
PerformanceVoTask
{
@Autowired
...
...
@@ -380,28 +383,38 @@ public class PerformanceVoTask {
KylinPerformanceMisVo
misVo
=
getPerformanceMisVo
(
performanceId
);
KylinPerformanceVo
mongoVo
=
mongoVoUtils
.
combinePerformanceVoData
(
performanceId
);
if
(!
misVo
.
getTitle
().
equals
(
mongoVo
.
getTitle
()))
{
log
.
debug
(
"NEED CHANGE TITLE"
);
return
true
;
}
else
if
(!
misVo
.
getType
().
equals
(
mongoVo
.
getType
()))
{
log
.
debug
(
"NEED CHANGE TYPE"
);
return
true
;
}
else
if
(!
misVo
.
getTimeStart
().
equals
(
mongoVo
.
getTimeStart
()))
{
log
.
debug
(
"NEED CHANGE TIMESTART"
);
return
true
;
}
else
if
(!
misVo
.
getTimeEnd
().
equals
(
mongoVo
.
getTimeEnd
()))
{
log
.
debug
(
"NEED CHANGE TIMEEND"
);
return
true
;
}
else
if
(!
misVo
.
getFieldId
().
equals
(
mongoVo
.
getFieldId
()))
{
log
.
debug
(
"NEED CHANGE FIELDID"
);
return
true
;
}
else
if
(!
misVo
.
getNotice
().
equals
(
mongoVo
.
getNotice
()))
{
log
.
debug
(
"NEED CHANGE NOTICE"
);
return
true
;
}
else
if
(!
misVo
.
getDetails
().
equals
(
mongoVo
.
getDetails
()))
{
log
.
debug
(
"NEED CHANGE DETAILS"
);
return
true
;
}
else
if
(!
misVo
.
getApprovalUrl
().
equals
(
mongoVo
.
getApprovalUrl
()))
{
log
.
debug
(
"NEED CHANGE APPROVALURL"
);
return
true
;
}
else
if
(!
misVo
.
getPayCountdownMinute
().
equals
(
mongoVo
.
getPayCountdownMinute
()))
{
log
.
debug
(
"NEED CHANGE PAYCOUTDOWN"
);
return
true
;
}
boolean
exists
=
mongoTemplate
.
exists
(
Query
.
query
(
Criteria
.
where
(
"status"
).
is
(-
1
).
and
(
"performancesId"
).
is
(
performanceId
)),
KylinTicketTimesPartnerVo
.
class
,
KylinTicketTimesPartnerVo
.
class
.
getSimpleName
());
if
(
exists
)
{
log
.
debug
(
"NEED CHANGE NEW TIMES"
);
return
true
;
}
...
...
@@ -410,21 +423,27 @@ public class PerformanceVoTask {
KylinTicketTimesVo
timesVo
=
mongoVo
.
getTicketTimeList
().
get
(
i
);
boolean
exists2
=
mongoTemplate
.
exists
(
Query
.
query
(
Criteria
.
where
(
"status"
).
is
(-
2
).
and
(
"timesId"
).
is
(
times
.
getTicketTimesId
())),
KylinTicketPartnerVo
.
class
,
KylinTicketPartnerVo
.
class
.
getSimpleName
());
if
(
exists2
)
{
log
.
debug
(
"NEED CHANGE NEW TICKET"
);
return
true
;
}
for
(
KylinTicketPartnerVo
ticketPartnerVo
:
times
.
getTicket
())
{
for
(
KylinTicketVo
ticketVo
:
timesVo
.
getTicketList
())
{
if
(
ticketVo
.
getTicketsId
().
equals
(
ticketPartnerVo
.
getTicketsId
()))
{
if
(!
ticketVo
.
getTitle
().
equals
(
ticketPartnerVo
.
getTitle
()))
{
log
.
debug
(
"NEED CHANGE TICKET TITLE"
);
return
true
;
}
else
if
(!
ticketVo
.
getQrCodeShowTime
().
equals
(
ticketPartnerVo
.
getQrCodeShowTime
()))
{
log
.
debug
(
"NEED CHANGE TICKET QRCODESHOWTIME"
);
return
true
;
}
else
if
(!
ticketVo
.
getDescribeElectronic
().
equals
(
ticketPartnerVo
.
getDescribeElectronic
()))
{
log
.
debug
(
"NEED CHANGE TICKET DESCRIBEELECTRONIC"
);
return
true
;
}
else
if
(!
ticketVo
.
getDescribeExpress
().
equals
(
ticketPartnerVo
.
getDescribeExpress
()))
{
log
.
debug
(
"NEED CHANGE TICKET DESCRIBEELEXPRESS"
);
return
true
;
}
if
(!
ticketVo
.
getDescribes
().
equals
(
ticketPartnerVo
.
getDescribes
()))
{
log
.
debug
(
"NEED CHANGE TICKET DESCRIBES"
);
return
true
;
}
break
;
...
...
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