记得上下班打卡 | 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
0e5faf8f
Commit
0e5faf8f
authored
Jul 08, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
88567036
6acbd7d5
Changes
43
Show whitespace changes
Inline
Side-by-side
Showing
43 changed files
with
196 additions
and
190 deletions
+196
-190
AdamAddressesParam.java
...va/com/liquidnet/service/adam/dto/AdamAddressesParam.java
+2
-3
AdamEntersParam.java
.../java/com/liquidnet/service/adam/dto/AdamEntersParam.java
+3
-4
AdamMemberOrderCodeParam.java
.../liquidnet/service/adam/dto/AdamMemberOrderCodeParam.java
+4
-4
AdamMemberOrderParam.java
.../com/liquidnet/service/adam/dto/AdamMemberOrderParam.java
+10
-10
AdamMemberPriceParam.java
.../com/liquidnet/service/adam/dto/AdamMemberPriceParam.java
+10
-10
AdamThirdPartParam.java
...va/com/liquidnet/service/adam/dto/AdamThirdPartParam.java
+2
-3
AdamUserInfoParam.java
...ava/com/liquidnet/service/adam/dto/AdamUserInfoParam.java
+9
-9
BannersSearchParam.java
...liquidnet/service/kylin/dto/param/BannersSearchParam.java
+2
-2
CheckPerformanceRelationParam.java
...ervice/kylin/dto/param/CheckPerformanceRelationParam.java
+2
-2
CheckUserParam.java
...com/liquidnet/service/kylin/dto/param/CheckUserParam.java
+4
-4
CreateRoadShowParam.java
...iquidnet/service/kylin/dto/param/CreateRoadShowParam.java
+1
-1
CreateTicketTimesParam.java
...idnet/service/kylin/dto/param/CreateTicketTimesParam.java
+1
-1
PayAgainParam.java
.../com/liquidnet/service/kylin/dto/param/PayAgainParam.java
+1
-1
PayOrderParam.java
.../com/liquidnet/service/kylin/dto/param/PayOrderParam.java
+8
-9
PerformanceAdminListParam.java
...et/service/kylin/dto/param/PerformanceAdminListParam.java
+4
-4
PerformancePartnerListParam.java
.../service/kylin/dto/param/PerformancePartnerListParam.java
+5
-5
PerformanceStep1Param.java
...uidnet/service/kylin/dto/param/PerformanceStep1Param.java
+14
-14
RefundBatchSearchParam.java
...idnet/service/kylin/dto/param/RefundBatchSearchParam.java
+2
-2
RefundSearchParam.java
.../liquidnet/service/kylin/dto/param/RefundSearchParam.java
+2
-2
TicketCreateParam.java
.../liquidnet/service/kylin/dto/param/TicketCreateParam.java
+13
-13
AdamMemberAdminController.java
...b/controller/zhengzai/adam/AdamMemberAdminController.java
+1
-1
AdamMemberPriceAdminController.java
...troller/zhengzai/adam/AdamMemberPriceAdminController.java
+3
-2
AdamUserMemberAdminController.java
...ntroller/zhengzai/adam/AdamUserMemberAdminController.java
+2
-2
OrderSwitchAdminController.java
...controller/zhengzai/order/OrderSwitchAdminController.java
+2
-1
RestControllerAdviceHandler.java
...quidnet/common/exception/RestControllerAdviceHandler.java
+4
-2
AdamAddressesController.java
...dnet/service/adam/controller/AdamAddressesController.java
+5
-5
AdamCollectionController.java
...net/service/adam/controller/AdamCollectionController.java
+3
-3
AdamDisposedController.java
...idnet/service/adam/controller/AdamDisposedController.java
+4
-4
AdamEntersController.java
...quidnet/service/adam/controller/AdamEntersController.java
+8
-8
AdamMemberController.java
...quidnet/service/adam/controller/AdamMemberController.java
+1
-1
AdamMemberOrderController.java
...et/service/adam/controller/AdamMemberOrderController.java
+5
-5
AdamUserController.java
...liquidnet/service/adam/controller/AdamUserController.java
+8
-5
errors.properties
...et-service-adam-impl/src/main/resources/errors.properties
+5
-5
KylinOrderTicketsController.java
...service/kylin/controller/KylinOrderTicketsController.java
+7
-7
errors.properties
...t-service-kylin-impl/src/main/resources/errors.properties
+3
-3
KylinOrderTicketsController.java
...service/order/controller/KylinOrderTicketsController.java
+1
-1
errors.properties
...t-service-order-impl/src/main/resources/errors.properties
+3
-3
KylinCheckUserPerformancesPartnerController.java
.../partner/KylinCheckUserPerformancesPartnerController.java
+9
-9
KylinTicketTimesPartnerController.java
...controller/partner/KylinTicketTimesPartnerController.java
+2
-2
KylinTicketsPartnerController.java
...orm/controller/partner/KylinTicketsPartnerController.java
+8
-5
PerformancePartnerController.java
...form/controller/partner/PerformancePartnerController.java
+7
-7
errors.properties
...ervice-platform-impl/src/main/resources/errors.properties
+3
-3
errors.properties
...quidnet-support-zuul/src/main/resources/errors.properties
+3
-3
No files found.
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamAddressesParam.java
View file @
0e5faf8f
...
@@ -14,7 +14,7 @@ public class AdamAddressesParam implements java.io.Serializable {
...
@@ -14,7 +14,7 @@ public class AdamAddressesParam implements java.io.Serializable {
@ApiModelProperty
(
position
=
10
,
required
=
false
,
value
=
"收获地址ID,编辑时必传[64]"
)
@ApiModelProperty
(
position
=
10
,
required
=
false
,
value
=
"收获地址ID,编辑时必传[64]"
)
private
String
addressesId
;
private
String
addressesId
;
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"姓名[50]"
,
example
=
"Swagger"
)
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"姓名[50]"
,
example
=
"Swagger"
)
@Size
(
min
=
1
,
max
=
30
)
@Size
(
min
=
1
,
max
=
30
,
message
=
"姓名长度限制1-30位"
)
private
String
name
;
private
String
name
;
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"手机号[11]"
,
example
=
"13111111111"
)
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"手机号[11]"
,
example
=
"13111111111"
)
@Pattern
(
regexp
=
"\\d{11}"
,
message
=
"手机号格式有误"
)
@Pattern
(
regexp
=
"\\d{11}"
,
message
=
"手机号格式有误"
)
...
@@ -23,13 +23,12 @@ public class AdamAddressesParam implements java.io.Serializable {
...
@@ -23,13 +23,12 @@ public class AdamAddressesParam implements java.io.Serializable {
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
CN_PCD
,
message
=
"省份必须为2~30位汉字"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
CN_PCD
,
message
=
"省份必须为2~30位汉字"
)
private
String
province
;
private
String
province
;
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"城市[30]"
,
example
=
"北京城区"
)
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"城市[30]"
,
example
=
"北京城区"
)
@NotNull
()
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
CN_PCD
,
message
=
"城市必须为2~30位汉字"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
CN_PCD
,
message
=
"城市必须为2~30位汉字"
)
private
String
city
;
private
String
city
;
@ApiModelProperty
(
position
=
15
,
required
=
true
,
value
=
"区县[30]"
,
example
=
"朝阳区"
)
@ApiModelProperty
(
position
=
15
,
required
=
true
,
value
=
"区县[30]"
,
example
=
"朝阳区"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
CN_PCD
,
message
=
"区县必须为2~30位汉字"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
CN_PCD
,
message
=
"区县必须为2~30位汉字"
)
private
String
county
;
private
String
county
;
@ApiModelProperty
(
position
=
16
,
required
=
true
,
value
=
"详细地址[100]"
,
example
=
"广渠路1号创1958园区"
)
@ApiModelProperty
(
position
=
16
,
required
=
true
,
value
=
"详细地址[100]"
,
example
=
"广渠路1号创1958园区"
)
@Size
(
max
=
100
)
@Size
(
max
=
100
,
message
=
"已超出详细地址长度限制"
)
private
String
address
;
private
String
address
;
}
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamEntersParam.java
View file @
0e5faf8f
...
@@ -14,17 +14,16 @@ public class AdamEntersParam implements java.io.Serializable {
...
@@ -14,17 +14,16 @@ public class AdamEntersParam implements java.io.Serializable {
@ApiModelProperty
(
position
=
10
,
required
=
false
,
value
=
"入场人ID,编辑时必传[50]"
)
@ApiModelProperty
(
position
=
10
,
required
=
false
,
value
=
"入场人ID,编辑时必传[50]"
)
private
String
entersId
;
private
String
entersId
;
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"入场人姓名[50]"
,
example
=
"测试"
)
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"入场人姓名[50]"
,
example
=
"测试"
)
// @Pattern(regexp = LnsRegex.Valid.CHINESE_HANZI, message = "姓名必须为2~20位汉字")
@Size
(
min
=
1
,
max
=
30
,
message
=
"姓名长度限制1-30位"
)
@Size
(
min
=
1
,
max
=
30
)
private
String
name
;
private
String
name
;
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"入场人手机号[11]"
,
example
=
"13100000000"
)
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"入场人手机号[11]"
,
example
=
"13100000000"
)
@Pattern
(
regexp
=
"\\d{11}"
,
message
=
"手机号格式有误"
)
@Pattern
(
regexp
=
"\\d{11}"
,
message
=
"手机号格式有误"
)
private
String
mobile
;
private
String
mobile
;
@ApiModelProperty
(
position
=
13
,
required
=
true
,
value
=
"证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证"
,
allowableValues
=
"1,2,3,4,5"
)
@ApiModelProperty
(
position
=
13
,
required
=
true
,
value
=
"证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证"
,
allowableValues
=
"1,2,3,4,5"
)
@NotNull
@Min
(
1
)
@Max
(
5
)
@NotNull
(
message
=
"证件类型不能位空"
)
@Min
(
value
=
1
,
message
=
"证件类型无效"
)
@Max
(
value
=
5
,
message
=
"证件类型无效"
)
private
Integer
type
;
private
Integer
type
;
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"入场人证件号[30]"
,
example
=
"110101110001010111"
)
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"入场人证件号[30]"
,
example
=
"110101110001010111"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
LETTER_NUMBER
,
message
=
"证件号格式有误"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
LETTER_NUMBER
,
message
=
"证件号格式有误"
)
@Size
(
min
=
1
,
max
=
30
)
@Size
(
min
=
1
,
max
=
30
,
message
=
"证件号长度限制1-30位"
)
private
String
idCard
;
private
String
idCard
;
}
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderCodeParam.java
View file @
0e5faf8f
...
@@ -13,12 +13,12 @@ import java.io.Serializable;
...
@@ -13,12 +13,12 @@ import java.io.Serializable;
public
class
AdamMemberOrderCodeParam
implements
Serializable
{
public
class
AdamMemberOrderCodeParam
implements
Serializable
{
private
static
final
long
serialVersionUID
=
2500742355642406263L
;
private
static
final
long
serialVersionUID
=
2500742355642406263L
;
@ApiModelProperty
(
position
=
10
,
required
=
true
,
value
=
"类型:2-会员码,3-礼包码"
,
example
=
"3"
)
@ApiModelProperty
(
position
=
10
,
required
=
true
,
value
=
"类型:2-会员码,3-礼包码"
,
example
=
"3"
)
@NotNull
@NotNull
(
message
=
"兑换码类型不能位空"
)
@Min
(
2
)
@Min
(
value
=
2
,
message
=
"兑换码类型无效"
)
@Max
(
3
)
@Max
(
value
=
3
,
message
=
"兑换码类型无效"
)
private
Integer
mode
;
private
Integer
mode
;
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"兑换码"
)
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"兑换码"
)
@NotBlank
@NotBlank
(
message
=
"兑换码不能为空"
)
private
String
memberCode
;
private
String
memberCode
;
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"生日"
,
example
=
"2021-05-27"
)
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"生日"
,
example
=
"2021-05-27"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_YMD
,
message
=
"生日格式有误"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_YMD
,
message
=
"生日格式有误"
)
...
...
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderParam.java
View file @
0e5faf8f
...
@@ -13,31 +13,31 @@ import java.math.BigDecimal;
...
@@ -13,31 +13,31 @@ import java.math.BigDecimal;
@Data
@Data
public
class
AdamMemberOrderParam
implements
Serializable
{
public
class
AdamMemberOrderParam
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
2605176979349053352L
;
private
static
final
long
serialVersionUID
=
-
2605176979349053352L
;
@ApiModelProperty
(
position
=
10
,
required
=
true
,
value
=
"会员ID[50]"
,
example
=
"1"
)
@ApiModelProperty
(
position
=
10
,
required
=
true
,
value
=
"会员
类型
ID[50]"
,
example
=
"1"
)
@NotBlank
@NotBlank
(
message
=
"会员类型ID不能为空"
)
private
String
memberId
;
private
String
memberId
;
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"会员价格ID"
,
example
=
"1"
)
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"会员价格ID"
,
example
=
"1"
)
@NotBlank
@NotBlank
(
message
=
"会员价格ID不能为空"
)
private
String
memberPriceId
;
private
String
memberPriceId
;
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"购买方式:0-购买会员,1-购买会员码"
,
allowableValues
=
"0,1"
)
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"购买方式:0-购买会员,1-购买会员码"
,
allowableValues
=
"0,1"
)
@NotNull
@NotNull
(
message
=
"购买方式不能为空"
)
@Min
(
0
)
@Min
(
value
=
0
,
message
=
"购买方式无效"
)
@Max
(
1
)
@Max
(
value
=
1
,
message
=
"购买方式无效"
)
private
Integer
mode
;
private
Integer
mode
;
@ApiModelProperty
(
position
=
13
,
required
=
true
,
value
=
"应付金额"
,
example
=
"0.01"
)
@ApiModelProperty
(
position
=
13
,
required
=
true
,
value
=
"应付金额"
,
example
=
"0.01"
)
@DecimalMin
(
"0.01
"
)
@DecimalMin
(
value
=
"0.01"
,
message
=
"应付金额有误
"
)
private
BigDecimal
price
;
private
BigDecimal
price
;
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"实付金额"
,
example
=
"0.01"
)
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"实付金额"
,
example
=
"0.01"
)
@DecimalMin
(
"0.01
"
)
@DecimalMin
(
value
=
"0.01"
,
message
=
"实付金额有误
"
)
private
BigDecimal
pricePaid
;
private
BigDecimal
pricePaid
;
@ApiModelProperty
(
position
=
15
,
required
=
true
,
value
=
"用户生日"
,
example
=
"2021-05-27"
)
@ApiModelProperty
(
position
=
15
,
required
=
true
,
value
=
"用户生日"
,
example
=
"2021-05-27"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_YMD
,
message
=
"生日格式有误"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_YMD
,
message
=
"生日格式有误"
)
private
String
birthday
;
private
String
birthday
;
@ApiModelProperty
(
position
=
16
,
required
=
true
,
value
=
"支付终端"
,
allowableValues
=
"app,wap,js,applet"
)
@ApiModelProperty
(
position
=
16
,
required
=
true
,
value
=
"支付终端"
,
allowableValues
=
"app,wap,js,applet"
)
@NotBlank
@NotBlank
(
message
=
"支付终端不能为空"
)
private
String
deviceFrom
;
private
String
deviceFrom
;
@ApiModelProperty
(
position
=
17
,
required
=
true
,
value
=
"支付方式"
,
allowableValues
=
"alipay,wepay"
)
@ApiModelProperty
(
position
=
17
,
required
=
true
,
value
=
"支付方式"
,
allowableValues
=
"alipay,wepay"
)
@NotBlank
@NotBlank
(
message
=
"支付方式不能为空"
)
private
String
payType
;
private
String
payType
;
@ApiModelProperty
(
position
=
18
,
required
=
false
,
value
=
"App内Apple支付必传"
)
@ApiModelProperty
(
position
=
18
,
required
=
false
,
value
=
"App内Apple支付必传"
)
private
String
productId
;
private
String
productId
;
...
...
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberPriceParam.java
View file @
0e5faf8f
...
@@ -19,25 +19,25 @@ public class AdamMemberPriceParam implements Serializable {
...
@@ -19,25 +19,25 @@ public class AdamMemberPriceParam implements Serializable {
@ApiModelProperty
(
position
=
1
,
value
=
"会员价格ID"
)
@ApiModelProperty
(
position
=
1
,
value
=
"会员价格ID"
)
private
String
memberPriceId
;
private
String
memberPriceId
;
@ApiModelProperty
(
position
=
2
,
value
=
"会员类型ID"
,
example
=
"1"
)
@ApiModelProperty
(
position
=
2
,
value
=
"会员类型ID"
,
example
=
"1"
)
@NotBlank
@NotBlank
(
message
=
"会员类型ID不能为空"
)
private
String
memberId
;
private
String
memberId
;
@ApiModelProperty
(
position
=
3
,
value
=
"状态:0-不可用,1-上线中,2-已下线"
,
allowableValues
=
"0,1,2"
)
@ApiModelProperty
(
position
=
3
,
value
=
"状态:0-不可用,1-上线中,2-已下线"
,
allowableValues
=
"0,1,2"
)
@NotNull
@NotNull
(
message
=
"状态不能为空"
)
@Min
(
1
)
@Min
(
value
=
1
,
message
=
"状态无效"
)
@Max
(
2
)
@Max
(
value
=
2
,
message
=
"状态无效"
)
private
Integer
state
;
private
Integer
state
;
@ApiModelProperty
(
position
=
4
,
value
=
"会员价格包名称"
,
example
=
"年卡"
)
@ApiModelProperty
(
position
=
4
,
value
=
"会员价格包名称"
,
example
=
"年卡"
)
@Size
(
min
=
1
,
max
=
30
)
@Size
(
min
=
1
,
max
=
30
,
message
=
"会员价格包名称长度限制1-30位"
)
private
String
name
;
private
String
name
;
@ApiModelProperty
(
position
=
5
,
value
=
"原价"
,
example
=
"199"
)
@ApiModelProperty
(
position
=
5
,
value
=
"原价"
,
example
=
"199"
)
@DecimalMin
(
"0.01
"
)
@DecimalMin
(
value
=
"0.01"
,
message
=
"原价有误
"
)
private
BigDecimal
price
;
private
BigDecimal
price
;
@ApiModelProperty
(
position
=
6
,
value
=
"折扣价"
,
example
=
"199"
)
@ApiModelProperty
(
position
=
6
,
value
=
"折扣价"
,
example
=
"199"
)
@DecimalMin
(
"0.01
"
)
@DecimalMin
(
value
=
"0.01"
,
message
=
"折扣价有误
"
)
private
BigDecimal
priceFixed
;
private
BigDecimal
priceFixed
;
@ApiModelProperty
(
position
=
7
,
value
=
"
会员包
有效天数"
,
example
=
"365"
)
@ApiModelProperty
(
position
=
7
,
value
=
"有效天数"
,
example
=
"365"
)
@NotNull
@NotNull
(
message
=
"有效天数不能为空"
)
@Min
(
30
)
@Min
(
value
=
30
,
message
=
"有效天数不得少于30天"
)
private
Integer
days
;
private
Integer
days
;
@ApiModelProperty
(
position
=
8
,
value
=
"会员包须知"
,
example
=
"会员包须知"
)
@ApiModelProperty
(
position
=
8
,
value
=
"会员包须知"
,
example
=
"会员包须知"
)
private
String
detail
;
private
String
detail
;
...
...
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamThirdPartParam.java
View file @
0e5faf8f
...
@@ -13,13 +13,12 @@ import java.io.Serializable;
...
@@ -13,13 +13,12 @@ import java.io.Serializable;
public
class
AdamThirdPartParam
implements
Serializable
{
public
class
AdamThirdPartParam
implements
Serializable
{
private
static
final
long
serialVersionUID
=
675588088506034208L
;
private
static
final
long
serialVersionUID
=
675588088506034208L
;
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"第三方OPENID[64]"
)
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"第三方OPENID[64]"
)
@NotBlank
@NotBlank
(
message
=
"OPENID不能为空"
)
private
String
openId
;
private
String
openId
;
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"昵称[64]"
,
example
=
"Swagger"
)
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"昵称[64]"
,
example
=
"Swagger"
)
// @Size(min = 2, max = 64)
private
String
nickname
;
private
String
nickname
;
@ApiModelProperty
(
position
=
13
,
required
=
true
,
value
=
"头像[255]"
,
example
=
"http://pic.zhengzai.tv/default/avatar.png"
)
@ApiModelProperty
(
position
=
13
,
required
=
true
,
value
=
"头像[255]"
,
example
=
"http://pic.zhengzai.tv/default/avatar.png"
)
@Size
(
max
=
255
)
@Size
(
max
=
255
,
message
=
"已超出头像链接长度限制"
)
private
String
avatar
;
private
String
avatar
;
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"平台类型[255]"
,
allowableValues
=
"WEIBO,WECHAT,QQ"
)
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"平台类型[255]"
,
allowableValues
=
"WEIBO,WECHAT,QQ"
)
//@Pattern(regexp = "\\b(WEIBO,WECHAT,QQ)\\b", message = "平台类型无效")
//@Pattern(regexp = "\\b(WEIBO,WECHAT,QQ)\\b", message = "平台类型无效")
...
...
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamUserInfoParam.java
View file @
0e5faf8f
...
@@ -18,25 +18,25 @@ import java.util.List;
...
@@ -18,25 +18,25 @@ import java.util.List;
public
class
AdamUserInfoParam
implements
java
.
io
.
Serializable
{
public
class
AdamUserInfoParam
implements
java
.
io
.
Serializable
{
private
static
final
long
serialVersionUID
=
-
1084524066864012398L
;
private
static
final
long
serialVersionUID
=
-
1084524066864012398L
;
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"头像[255]"
,
example
=
"http://pic.zhengzai.tv/default/avatar.png"
)
@ApiModelProperty
(
position
=
11
,
required
=
true
,
value
=
"头像[255]"
,
example
=
"http://pic.zhengzai.tv/default/avatar.png"
)
@Size
(
max
=
255
)
@Size
(
max
=
255
,
message
=
"已超出头像链接长度限制"
)
private
String
avatar
;
private
String
avatar
;
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"背景[255]"
,
example
=
"https://img.zhengzai.tv/files/2021/01/13/5ffeab3584b7d.png"
)
@ApiModelProperty
(
position
=
12
,
required
=
true
,
value
=
"背景[255]"
,
example
=
"https://img.zhengzai.tv/files/2021/01/13/5ffeab3584b7d.png"
)
@Size
(
max
=
255
)
@Size
(
max
=
255
,
message
=
"已超出背景链接长度限制"
)
private
String
background
;
private
String
background
;
@ApiModelProperty
(
position
=
13
,
required
=
true
,
value
=
"昵称[
32
]"
,
example
=
"Swagger"
)
@ApiModelProperty
(
position
=
13
,
required
=
true
,
value
=
"昵称[
14
]"
,
example
=
"Swagger"
)
@Size
(
min
=
2
,
max
=
64
)
@Size
(
min
=
2
,
max
=
14
,
message
=
"昵称限制2-14位且不能包含特殊字符"
)
private
String
nickname
;
private
String
nickname
;
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"性别[32]"
,
example
=
"{\"val\":\"MS00\",\"desc\":\"其他性别\"}"
)
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"性别[32]"
,
example
=
"{\"val\":\"MS00\",\"desc\":\"其他性别\"}"
)
@NotNull
@NotNull
(
message
=
"性别不能为空"
)
private
AdamTagVo
sex
;
private
AdamTagVo
sex
;
@ApiModelProperty
(
position
=
15
,
required
=
true
,
value
=
"生日[YYYY-MM-DD]"
,
example
=
"2021-05-17"
)
@ApiModelProperty
(
position
=
15
,
required
=
true
,
value
=
"生日[YYYY-MM-DD]"
,
example
=
"2021-05-17"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_YMD
,
message
=
"
时间
格式有误"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_YMD
,
message
=
"
生日
格式有误"
)
private
String
birthday
;
private
String
birthday
;
@ApiModelProperty
(
position
=
16
,
required
=
true
,
value
=
"常住地/区域[100]"
,
example
=
"北京 北京市 朝阳区"
)
@ApiModelProperty
(
position
=
16
,
required
=
true
,
value
=
"常住地/区域[100]"
,
example
=
"北京 北京市 朝阳区"
)
@NotBlank
@NotBlank
(
message
=
"常住地不能为空"
)
private
String
area
;
private
String
area
;
@ApiModelProperty
(
position
=
17
,
required
=
true
,
value
=
"签名[
25
5]"
,
example
=
"..................."
)
@ApiModelProperty
(
position
=
17
,
required
=
true
,
value
=
"签名[
1
5]"
,
example
=
"..................."
)
@Size
(
max
=
255
)
@Size
(
max
=
15
,
message
=
"已超出签名长度限制"
)
private
String
signature
;
private
String
signature
;
@ApiModelProperty
(
position
=
18
,
required
=
true
,
value
=
"标签[500]"
,
example
=
"[{\"val\":\"MMS01\",\"desc\":\"民歌\",\"tagVos\":[{\"val\":\"MMS0101\",\"desc\":\"A\"},{\"val\":\"MMS0102\",\"desc\":\"B\"}]},{\"val\":\"MMS02\",\"desc\":\"house\",\"tagVos\":[{\"val\":\"MMS0201\",\"desc\":\"C\"}]}]"
)
@ApiModelProperty
(
position
=
18
,
required
=
true
,
value
=
"标签[500]"
,
example
=
"[{\"val\":\"MMS01\",\"desc\":\"民歌\",\"tagVos\":[{\"val\":\"MMS0101\",\"desc\":\"A\"},{\"val\":\"MMS0102\",\"desc\":\"B\"}]},{\"val\":\"MMS02\",\"desc\":\"house\",\"tagVos\":[{\"val\":\"MMS0201\",\"desc\":\"C\"}]}]"
)
// @NotNull
// @NotNull
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/BannersSearchParam.java
View file @
0e5faf8f
...
@@ -29,10 +29,10 @@ public class BannersSearchParam implements Serializable {
...
@@ -29,10 +29,10 @@ public class BannersSearchParam implements Serializable {
private
Integer
promotionType
;
private
Integer
promotionType
;
@ApiModelProperty
(
value
=
"页数"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"页数"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
页数
不能为空"
)
private
Integer
pageSize
;
private
Integer
pageSize
;
@ApiModelProperty
(
value
=
"数量"
,
example
=
"20"
)
@ApiModelProperty
(
value
=
"数量"
,
example
=
"20"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
数量
不能为空"
)
private
Integer
pageNum
;
private
Integer
pageNum
;
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/CheckPerformanceRelationParam.java
View file @
0e5faf8f
...
@@ -8,9 +8,9 @@ import javax.validation.constraints.NotNull;
...
@@ -8,9 +8,9 @@ import javax.validation.constraints.NotNull;
@Data
@Data
public
class
CheckPerformanceRelationParam
{
public
class
CheckPerformanceRelationParam
{
@ApiModelProperty
(
value
=
"演出id"
)
@ApiModelProperty
(
value
=
"演出id"
)
@NotNull
@NotNull
(
message
=
"演出ID不能为空"
)
private
String
performanceId
;
private
String
performanceId
;
@ApiModelProperty
(
value
=
"可下载时间"
)
@ApiModelProperty
(
value
=
"可下载时间"
)
@NotNull
@NotNull
(
message
=
"可下载时间不能为空"
)
private
String
canDownTime
;
private
String
canDownTime
;
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/CheckUserParam.java
View file @
0e5faf8f
...
@@ -9,11 +9,11 @@ import java.util.List;
...
@@ -9,11 +9,11 @@ import java.util.List;
@Data
@Data
public
class
CheckUserParam
{
public
class
CheckUserParam
{
@ApiModelProperty
(
value
=
"
演出id
"
)
@ApiModelProperty
(
value
=
"
验票用户ID
"
)
@NotNull
@NotNull
(
message
=
"验票用户ID不能为空"
)
private
String
checkUserId
;
private
String
checkUserId
;
@ApiModelProperty
(
value
=
"
可下载时间
"
)
@ApiModelProperty
(
value
=
"
关联演出
"
)
@NotNull
@NotNull
(
message
=
"关联演出不能为空"
)
@Size
(
min
=
1
)
@Size
(
min
=
1
)
private
List
<
CheckPerformanceRelationParam
>
checkPerformanceRelationParamList
;
private
List
<
CheckPerformanceRelationParam
>
checkPerformanceRelationParamList
;
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/CreateRoadShowParam.java
View file @
0e5faf8f
...
@@ -13,7 +13,7 @@ public class CreateRoadShowParam implements Serializable {
...
@@ -13,7 +13,7 @@ public class CreateRoadShowParam implements Serializable {
@ApiModelProperty
(
value
=
"巡演主键"
,
example
=
""
)
@ApiModelProperty
(
value
=
"巡演主键"
,
example
=
""
)
private
String
roadShowsId
;
private
String
roadShowsId
;
@ApiModelProperty
(
value
=
"标题"
,
example
=
""
)
@ApiModelProperty
(
value
=
"标题"
,
example
=
""
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
标题
不能为空"
)
private
String
title
;
private
String
title
;
// @ApiModelProperty(value = "场地主键", example = "测试场地")
// @ApiModelProperty(value = "场地主键", example = "测试场地")
// private String imgPoster;
// private String imgPoster;
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/CreateTicketTimesParam.java
View file @
0e5faf8f
...
@@ -15,7 +15,7 @@ public class CreateTicketTimesParam implements Serializable {
...
@@ -15,7 +15,7 @@ public class CreateTicketTimesParam implements Serializable {
private
String
ticketTimesId
;
private
String
ticketTimesId
;
@ApiModelProperty
(
value
=
"演出Id"
,
example
=
"1"
)
@ApiModelProperty
(
value
=
"演出Id"
,
example
=
"1"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
演出ID
不能为空"
)
private
String
PerformancesId
;
private
String
PerformancesId
;
@ApiModelProperty
(
value
=
"场次标题"
,
example
=
"测试标题"
)
@ApiModelProperty
(
value
=
"场次标题"
,
example
=
"测试标题"
)
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PayAgainParam.java
View file @
0e5faf8f
...
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
...
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
@Data
@Data
public
class
PayAgainParam
{
public
class
PayAgainParam
{
@ApiModelProperty
(
value
=
"订单id"
)
@ApiModelProperty
(
value
=
"订单id"
)
@NotNull
(
message
=
"订单
id
不能为空"
)
@NotNull
(
message
=
"订单
ID
不能为空"
)
private
String
orderId
;
private
String
orderId
;
@ApiModelProperty
(
value
=
"支付类型"
)
@ApiModelProperty
(
value
=
"支付类型"
)
@NotNull
(
message
=
"支付类型不能为空"
)
@NotNull
(
message
=
"支付类型不能为空"
)
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PayOrderParam.java
View file @
0e5faf8f
...
@@ -14,18 +14,17 @@ import java.util.List;
...
@@ -14,18 +14,17 @@ import java.util.List;
@Data
@Data
public
class
PayOrderParam
{
public
class
PayOrderParam
{
@ApiModelProperty
(
value
=
"演出id"
)
@ApiModelProperty
(
value
=
"演出id"
)
@NotNull
(
message
=
"演出
id
不能为空"
)
@NotNull
(
message
=
"演出
ID
不能为空"
)
private
String
performanceId
;
private
String
performanceId
;
@ApiModelProperty
(
value
=
"场次id"
)
@ApiModelProperty
(
value
=
"场次id"
)
@NotNull
(
message
=
"场次
id
不能为空"
)
@NotNull
(
message
=
"场次
ID
不能为空"
)
private
String
timeId
;
private
String
timeId
;
@ApiModelProperty
(
value
=
"票种id"
)
@ApiModelProperty
(
value
=
"票种id"
)
@NotNull
(
message
=
"票种id不能为空"
)
@NotNull
(
message
=
"票种ID不能为空"
)
@NotNull
(
message
=
"必传"
)
private
String
ticketId
;
private
String
ticketId
;
@ApiModelProperty
(
value
=
"数量"
)
@ApiModelProperty
(
value
=
"数量"
)
@NotNull
(
message
=
"数量不能为空"
)
@NotNull
(
message
=
"数量不能为空"
)
@Min
(
value
=
1
,
message
=
"不能小于0"
)
@Min
(
value
=
1
,
message
=
"
数量
不能小于0"
)
private
Integer
number
;
private
Integer
number
;
// @ApiModelProperty(value = "是否学生票")
// @ApiModelProperty(value = "是否学生票")
...
@@ -41,12 +40,12 @@ public class PayOrderParam {
...
@@ -41,12 +40,12 @@ public class PayOrderParam {
@ApiModelProperty
(
value
=
"入场人id数组"
)
@ApiModelProperty
(
value
=
"入场人id数组"
)
private
List
<
String
>
enterIdList
;
private
List
<
String
>
enterIdList
;
@ApiModelProperty
(
value
=
"代理id"
)
@ApiModelProperty
(
value
=
"代理id"
)
@NotNull
(
message
=
"代理
id
不能为空"
)
@NotNull
(
message
=
"代理
ID
不能为空"
)
private
String
agentId
;
private
String
agentId
;
@ApiModelProperty
(
value
=
"快递类型 1寄付 2到付"
)
@ApiModelProperty
(
value
=
"快递类型 1寄付 2到付"
)
@NotNull
(
message
=
"快递方式不能为空"
)
@NotNull
(
message
=
"快递方式不能为空"
)
@Max
(
2
)
@Max
(
value
=
2
,
message
=
"快递方式无效"
)
@Min
(
1
)
@Min
(
value
=
1
,
message
=
"快递方式无效"
)
private
Integer
expressType
;
private
Integer
expressType
;
...
@@ -54,7 +53,7 @@ public class PayOrderParam {
...
@@ -54,7 +53,7 @@ public class PayOrderParam {
@NotNull
(
message
=
"支付类型不能为空"
)
@NotNull
(
message
=
"支付类型不能为空"
)
private
String
payType
;
private
String
payType
;
@ApiModelProperty
(
value
=
"支付来源"
)
@ApiModelProperty
(
value
=
"支付来源"
)
@NotNull
(
message
=
"支付来源"
)
@NotNull
(
message
=
"支付来源
不能为空
"
)
private
String
deviceFrom
;
private
String
deviceFrom
;
@ApiModelProperty
(
value
=
"openId"
)
@ApiModelProperty
(
value
=
"openId"
)
private
String
openId
;
private
String
openId
;
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceAdminListParam.java
View file @
0e5faf8f
...
@@ -12,22 +12,22 @@ public class PerformanceAdminListParam {
...
@@ -12,22 +12,22 @@ public class PerformanceAdminListParam {
@ApiModelProperty
(
value
=
"演出名称"
,
example
=
""
)
@ApiModelProperty
(
value
=
"演出名称"
,
example
=
""
)
private
String
title
;
private
String
title
;
@ApiModelProperty
(
value
=
"-2全部状态:-1删除;0未提交;1审核中;2审核中(自动上线);3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退"
,
example
=
"-2"
)
@ApiModelProperty
(
value
=
"-2全部状态:-1删除;0未提交;1审核中;2审核中(自动上线);3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退"
,
example
=
"-2"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
演出状态
不能为空"
)
private
Integer
status
;
private
Integer
status
;
@ApiModelProperty
(
value
=
"城市名称"
,
example
=
""
)
@ApiModelProperty
(
value
=
"城市名称"
,
example
=
""
)
private
String
cityName
;
private
String
cityName
;
@ApiModelProperty
(
value
=
"-2全部,0审核中,2审核拒绝"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"-2全部,0审核中,2审核拒绝"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
审核状态
不能为空"
)
private
Integer
auditStatus
;
private
Integer
auditStatus
;
@ApiModelProperty
(
value
=
"停售时间(天)-2全部"
,
example
=
"-2"
)
@ApiModelProperty
(
value
=
"停售时间(天)-2全部"
,
example
=
"-2"
)
private
long
stopSellDay
;
private
long
stopSellDay
;
@ApiModelProperty
(
value
=
"停售时间"
,
example
=
"2000-01-01 12:00:00"
,
hidden
=
true
)
@ApiModelProperty
(
value
=
"停售时间"
,
example
=
"2000-01-01 12:00:00"
,
hidden
=
true
)
private
String
stopSellTime
;
private
String
stopSellTime
;
@ApiModelProperty
(
value
=
"页数"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"页数"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
页数
不能为空"
)
private
Integer
pageSize
;
private
Integer
pageSize
;
@ApiModelProperty
(
value
=
"数量"
,
example
=
"20"
)
@ApiModelProperty
(
value
=
"数量"
,
example
=
"20"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
数量
不能为空"
)
private
Integer
pageNum
;
private
Integer
pageNum
;
@ApiModelProperty
(
value
=
"排序字段"
,
hidden
=
true
)
@ApiModelProperty
(
value
=
"排序字段"
,
hidden
=
true
)
private
String
orderItem
;
private
String
orderItem
;
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformancePartnerListParam.java
View file @
0e5faf8f
...
@@ -15,27 +15,27 @@ public class PerformancePartnerListParam {
...
@@ -15,27 +15,27 @@ public class PerformancePartnerListParam {
@ApiModelProperty
(
value
=
"演出名称"
,
example
=
""
)
@ApiModelProperty
(
value
=
"演出名称"
,
example
=
""
)
private
String
title
;
private
String
title
;
@ApiModelProperty
(
value
=
"-2全部(不包括未提交)0未发布演出列表;3审核通过;6上线;7下架;8已结束;"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"-2全部(不包括未提交)0未发布演出列表;3审核通过;6上线;7下架;8已结束;"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
演出状态
不能为空"
)
private
Integer
status
;
private
Integer
status
;
@ApiModelProperty
(
value
=
"-2全部,-1未提交审核,0审核中,1审核通过,2审核拒绝"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"-2全部,-1未提交审核,0审核中,1审核通过,2审核拒绝"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
审核状态
不能为空"
)
private
Integer
auditStatus
;
private
Integer
auditStatus
;
@ApiModelProperty
(
value
=
"演出开始时间"
,
example
=
"2000-01-01 12:00:00"
)
@ApiModelProperty
(
value
=
"演出开始时间"
,
example
=
"2000-01-01 12:00:00"
)
private
String
timeStart
;
private
String
timeStart
;
@ApiModelProperty
(
value
=
"演出结束时间"
,
example
=
"2000-01-01 12:00:00"
)
@ApiModelProperty
(
value
=
"演出结束时间"
,
example
=
"2000-01-01 12:00:00"
)
private
String
timeEnd
;
private
String
timeEnd
;
@ApiModelProperty
(
value
=
"排序类型 1创建时间倒序 2创建时间正序 3演出时间倒序 4演出时间正序"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"排序类型 1创建时间倒序 2创建时间正序 3演出时间倒序 4演出时间正序"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
排序类型
不能为空"
)
private
Integer
orderType
;
private
Integer
orderType
;
@ApiModelProperty
(
value
=
"停售时间(单位天 -2全部)"
,
example
=
"-2"
)
@ApiModelProperty
(
value
=
"停售时间(单位天 -2全部)"
,
example
=
"-2"
)
private
long
stopSellDay
;
private
long
stopSellDay
;
@ApiModelProperty
(
value
=
"停售时间(单位天 -2全部)"
,
example
=
"-2"
,
hidden
=
true
)
@ApiModelProperty
(
value
=
"停售时间(单位天 -2全部)"
,
example
=
"-2"
,
hidden
=
true
)
private
String
stopSellTime
;
private
String
stopSellTime
;
@ApiModelProperty
(
value
=
"页数"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"页数"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
页数
不能为空"
)
private
Integer
page
;
private
Integer
page
;
@ApiModelProperty
(
value
=
"数量"
,
example
=
"20"
)
@ApiModelProperty
(
value
=
"数量"
,
example
=
"20"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
数量
不能为空"
)
private
Integer
size
;
private
Integer
size
;
@ApiModelProperty
(
value
=
"排序字段"
,
hidden
=
true
)
@ApiModelProperty
(
value
=
"排序字段"
,
hidden
=
true
)
private
String
orderItem
;
private
String
orderItem
;
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep1Param.java
View file @
0e5faf8f
...
@@ -15,31 +15,31 @@ public class PerformanceStep1Param implements Serializable {
...
@@ -15,31 +15,31 @@ public class PerformanceStep1Param implements Serializable {
private
String
performancesId
;
private
String
performancesId
;
@ApiModelProperty
(
value
=
"封面图"
,
example
=
"https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png"
)
@ApiModelProperty
(
value
=
"封面图"
,
example
=
"https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
封面图
不能为空"
)
private
String
imgPoster
;
private
String
imgPoster
;
@ApiModelProperty
(
value
=
"第三方id"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"第三方id"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
第三方ID
不能为空"
)
private
String
merchantId
;
private
String
merchantId
;
@ApiModelProperty
(
value
=
"演出名称"
,
example
=
"测试演出"
)
@ApiModelProperty
(
value
=
"演出名称"
,
example
=
"测试演出"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
演出名称
不能为空"
)
private
String
title
;
private
String
title
;
@ApiModelProperty
(
value
=
"1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演"
,
example
=
"3"
)
@ApiModelProperty
(
value
=
"1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演"
,
example
=
"3"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
演出类型
不能为空"
)
private
Integer
type
;
private
Integer
type
;
@ApiModelProperty
(
value
=
"演出开始时间"
,
example
=
"2021-05-01 12:00:00"
)
@ApiModelProperty
(
value
=
"演出开始时间"
,
example
=
"2021-05-01 12:00:00"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
演出开始时间
不能为空"
)
private
String
timeStart
;
private
String
timeStart
;
@ApiModelProperty
(
value
=
"演出结束时间"
,
example
=
"2021-05-04 12:00:00"
)
@ApiModelProperty
(
value
=
"演出结束时间"
,
example
=
"2021-05-04 12:00:00"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
演出结束时间
不能为空"
)
private
String
timeEnd
;
private
String
timeEnd
;
@ApiModelProperty
(
value
=
"场地id"
,
example
=
"1"
)
@ApiModelProperty
(
value
=
"场地id"
,
example
=
"1"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
场地ID
不能为空"
)
private
String
fieldId
;
private
String
fieldId
;
@ApiModelProperty
(
value
=
"场地名称"
,
example
=
""
)
@ApiModelProperty
(
value
=
"场地名称"
,
example
=
""
)
...
@@ -49,7 +49,7 @@ public class PerformanceStep1Param implements Serializable {
...
@@ -49,7 +49,7 @@ public class PerformanceStep1Param implements Serializable {
private
String
notice
;
private
String
notice
;
@ApiModelProperty
(
value
=
"主办方id"
,
example
=
"1"
)
@ApiModelProperty
(
value
=
"主办方id"
,
example
=
"1"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
主办方ID
不能为空"
)
private
String
sponsorId
;
private
String
sponsorId
;
@ApiModelProperty
(
value
=
"主办方类型"
,
example
=
"1"
)
@ApiModelProperty
(
value
=
"主办方类型"
,
example
=
"1"
)
...
@@ -59,30 +59,30 @@ public class PerformanceStep1Param implements Serializable {
...
@@ -59,30 +59,30 @@ public class PerformanceStep1Param implements Serializable {
private
String
sponsor
;
private
String
sponsor
;
@ApiModelProperty
(
value
=
"联系人"
,
example
=
"联系人"
)
@ApiModelProperty
(
value
=
"联系人"
,
example
=
"联系人"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
联系人
不能为空"
)
private
String
contacts
;
private
String
contacts
;
@ApiModelProperty
(
value
=
"联系方式"
,
example
=
"手机号"
)
@ApiModelProperty
(
value
=
"联系方式"
,
example
=
"手机号"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
联系方式
不能为空"
)
private
String
mobile
;
private
String
mobile
;
@ApiModelProperty
(
value
=
"演出详情"
,
example
=
"<p>演出详情</p>"
)
@ApiModelProperty
(
value
=
"演出详情"
,
example
=
"<p>演出详情</p>"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
演出详情
不能为空"
)
private
String
details
;
private
String
details
;
@ApiModelProperty
(
value
=
"演出批文地址"
,
example
=
"这是一个演出批文地址"
)
@ApiModelProperty
(
value
=
"演出批文地址"
,
example
=
"这是一个演出批文地址"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
演出批文地址
不能为空"
)
private
String
approvalUrl
;
private
String
approvalUrl
;
@ApiModelProperty
(
value
=
"待支付时间"
,
example
=
"5"
)
@ApiModelProperty
(
value
=
"待支付时间"
,
example
=
"5"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
待支付时间
不能为空"
)
private
Integer
payCountdownMinute
;
private
Integer
payCountdownMinute
;
@ApiModelProperty
(
value
=
"购票须知"
,
hidden
=
true
,
example
=
"[{\"id\":1,\"title\":\"\\u95e8\\u7968\\u4e0d\\u9000\\u4e0d\\u6362\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c45722882a13.png\",\"text\":\"\\u95e8\\u7968\\u4e3a\\u6709\\u4ef7\\u8bc1\\u5238\\uff0c\\u5e76\\u975e\\u5546\\u54c1\\uff0c\\u4e00\\u7ecf\\u552e\\u51fa\\u4e0d\\u4e88\\u9000\\u6362\\u3002\\u56e0\\u201c\\u4e0d\\u53ef\\u6297\\u529b\\u201d\\u5bfc\\u81f4\\u7684\\u6f14\\u51fa\\u53d6\\u6d88\\u6216\\u5ef6\\u671f\\u9664\\u5916\\u3002\",\"sort\":1},{\"id\":3,\"title\":\"\\u4ec5\\u8bbe\\u7ad9\\u5e2d\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e93db0b9.png\",\"text\":\"\\u672c\\u573a\\u6f14\\u51fa\\u4e0d\\u8bbe\\u5ea7\\u4f4d\\uff0c\\u5747\\u4e3a\\u7ad9\\u5e2d\\u89c2\\u6f14\\u3002\",\"sort\":2},{\"id\":4,\"title\":\"\\u7981\\u6b62\\u4e2a\\u4eba\\u7968\\u52a1\\u4e70\\u5356\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e5c27644.png\",\"text\":\"\\u4e3a\\u9632\\u6b62\\u4e0d\\u6cd5\\u5206\\u5b50\\u5229\\u7528\\u7968\\u52a1\\u8f6c\\u8ba9\\u8bc8\\u9a97\\u94b1\\u6b3e\\uff0c\\u5efa\\u8bae\\u5e7f\\u5927\\u4e50\\u8ff7\\u4e0d\\u8981\\u8fdb\\u884c\\u4e2a\\u4eba\\u95f4\\u7968\\u52a1\\u4e70\\u5356\\uff0c\\u4e0d\\u8981\\u8f7b\\u6613\\u76f8\\u4fe1\\u6765\\u6e90\\u4e0d\\u660e\\u7684\\u8f6c\\u7968\\uff0c\\u4ee5\\u514d\\u81ea\\u8eab\\u5229\\u76ca\\u53d7\\u5230\\u4fb5\\u5bb3\\u3002\",\"sort\":3}]"
)
@ApiModelProperty
(
value
=
"购票须知"
,
hidden
=
true
,
example
=
"[{\"id\":1,\"title\":\"\\u95e8\\u7968\\u4e0d\\u9000\\u4e0d\\u6362\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c45722882a13.png\",\"text\":\"\\u95e8\\u7968\\u4e3a\\u6709\\u4ef7\\u8bc1\\u5238\\uff0c\\u5e76\\u975e\\u5546\\u54c1\\uff0c\\u4e00\\u7ecf\\u552e\\u51fa\\u4e0d\\u4e88\\u9000\\u6362\\u3002\\u56e0\\u201c\\u4e0d\\u53ef\\u6297\\u529b\\u201d\\u5bfc\\u81f4\\u7684\\u6f14\\u51fa\\u53d6\\u6d88\\u6216\\u5ef6\\u671f\\u9664\\u5916\\u3002\",\"sort\":1},{\"id\":3,\"title\":\"\\u4ec5\\u8bbe\\u7ad9\\u5e2d\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e93db0b9.png\",\"text\":\"\\u672c\\u573a\\u6f14\\u51fa\\u4e0d\\u8bbe\\u5ea7\\u4f4d\\uff0c\\u5747\\u4e3a\\u7ad9\\u5e2d\\u89c2\\u6f14\\u3002\",\"sort\":2},{\"id\":4,\"title\":\"\\u7981\\u6b62\\u4e2a\\u4eba\\u7968\\u52a1\\u4e70\\u5356\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e5c27644.png\",\"text\":\"\\u4e3a\\u9632\\u6b62\\u4e0d\\u6cd5\\u5206\\u5b50\\u5229\\u7528\\u7968\\u52a1\\u8f6c\\u8ba9\\u8bc8\\u9a97\\u94b1\\u6b3e\\uff0c\\u5efa\\u8bae\\u5e7f\\u5927\\u4e50\\u8ff7\\u4e0d\\u8981\\u8fdb\\u884c\\u4e2a\\u4eba\\u95f4\\u7968\\u52a1\\u4e70\\u5356\\uff0c\\u4e0d\\u8981\\u8f7b\\u6613\\u76f8\\u4fe1\\u6765\\u6e90\\u4e0d\\u660e\\u7684\\u8f6c\\u7968\\uff0c\\u4ee5\\u514d\\u81ea\\u8eab\\u5229\\u76ca\\u53d7\\u5230\\u4fb5\\u5bb3\\u3002\",\"sort\":3}]"
)
private
String
noticeImage
;
private
String
noticeImage
;
@ApiModelProperty
(
value
=
"购票须知 Id 数组"
)
@ApiModelProperty
(
value
=
"购票须知 Id 数组"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
购票须知
不能为空"
)
private
List
<
String
>
noticeIds
;
private
List
<
String
>
noticeIds
;
@ApiModelProperty
(
value
=
"演出简介"
,
example
=
""
)
@ApiModelProperty
(
value
=
"演出简介"
,
example
=
""
)
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundBatchSearchParam.java
View file @
0e5faf8f
...
@@ -26,11 +26,11 @@ public class RefundBatchSearchParam implements Serializable {
...
@@ -26,11 +26,11 @@ public class RefundBatchSearchParam implements Serializable {
private
String
createdAt
;
private
String
createdAt
;
@ApiModelProperty
(
value
=
"页数"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"页数"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
页数
不能为空"
)
private
Integer
pageSize
;
private
Integer
pageSize
;
@ApiModelProperty
(
value
=
"数量"
,
example
=
"20"
)
@ApiModelProperty
(
value
=
"数量"
,
example
=
"20"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
数量
不能为空"
)
private
Integer
pageNum
;
private
Integer
pageNum
;
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundSearchParam.java
View file @
0e5faf8f
...
@@ -28,11 +28,11 @@ public class RefundSearchParam implements Serializable {
...
@@ -28,11 +28,11 @@ public class RefundSearchParam implements Serializable {
private
Integer
status
;
private
Integer
status
;
@ApiModelProperty
(
value
=
"页数"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"页数"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
页数
不能为空"
)
private
Integer
pageSize
;
private
Integer
pageSize
;
@ApiModelProperty
(
value
=
"数量"
,
example
=
"20"
)
@ApiModelProperty
(
value
=
"数量"
,
example
=
"20"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
数量
不能为空"
)
private
Integer
pageNum
;
private
Integer
pageNum
;
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/TicketCreateParam.java
View file @
0e5faf8f
...
@@ -24,59 +24,59 @@ public class TicketCreateParam implements Serializable {
...
@@ -24,59 +24,59 @@ public class TicketCreateParam implements Serializable {
private
String
ticketsId
;
private
String
ticketsId
;
@ApiModelProperty
(
value
=
"场次Id"
)
@ApiModelProperty
(
value
=
"场次Id"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
场次ID
不能为空"
)
private
String
timesId
;
private
String
timesId
;
@ApiModelProperty
(
value
=
"票种名称"
,
example
=
"测试票"
)
@ApiModelProperty
(
value
=
"票种名称"
,
example
=
"测试票"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
票种名称
不能为空"
)
private
String
title
;
private
String
title
;
// @ApiModelProperty(value = "类型", example = "2")
// @ApiModelProperty(value = "类型", example = "2")
// private int type;
// private int type;
@ApiModelProperty
(
value
=
"是否学生票 0否 1是"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"是否学生票 0否 1是"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
是否学生票
不能为空"
)
private
Integer
isStudent
;
private
Integer
isStudent
;
@ApiModelProperty
(
value
=
"是否电子票"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"是否电子票"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
是否电子票
不能为空"
)
private
Integer
isElectronic
;
private
Integer
isElectronic
;
@ApiModelProperty
(
value
=
"是否电子票"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"是否电子票"
,
example
=
"0"
)
private
String
describeExpress
;
private
String
describeExpress
;
@ApiModelProperty
(
value
=
"是否快递票"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"是否快递票"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
是否快递票
不能为空"
)
private
Integer
isExpress
;
private
Integer
isExpress
;
@ApiModelProperty
(
value
=
"是否电子票"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"是否电子票"
,
example
=
"0"
)
private
String
describeElectronic
;
private
String
describeElectronic
;
@ApiModelProperty
(
value
=
"价格"
,
example
=
"100.00"
)
@ApiModelProperty
(
value
=
"价格"
,
example
=
"100.00"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
价格
不能为空"
)
private
BigDecimal
price
;
private
BigDecimal
price
;
@ApiModelProperty
(
value
=
"快递票截止日期"
,
example
=
"2020-12-01T12:00:00"
)
@ApiModelProperty
(
value
=
"快递票截止日期"
,
example
=
"2020-12-01T12:00:00"
)
private
LocalDateTime
timeEndExpress
;
private
LocalDateTime
timeEndExpress
;
@ApiModelProperty
(
value
=
"总库存"
,
example
=
"100"
)
@ApiModelProperty
(
value
=
"总库存"
,
example
=
"100"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
总库存
不能为空"
)
private
Integer
totalGeneral
;
private
Integer
totalGeneral
;
@ApiModelProperty
(
value
=
"总兑换库存"
,
example
=
"100"
)
@ApiModelProperty
(
value
=
"总兑换库存"
,
example
=
"100"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
总兑换库存
不能为空"
)
private
Integer
totalExchange
;
private
Integer
totalExchange
;
@ApiModelProperty
(
value
=
"限购数量"
,
example
=
"0"
)
@ApiModelProperty
(
value
=
"限购数量"
,
example
=
"0"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
限购数量
不能为空"
)
private
Integer
limitCount
;
private
Integer
limitCount
;
@ApiModelProperty
(
value
=
"票种开售时间"
,
example
=
"2020-12-01T12:00:00"
)
@ApiModelProperty
(
value
=
"票种开售时间"
,
example
=
"2020-12-01T12:00:00"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
票种开售时间
不能为空"
)
private
LocalDateTime
timeStart
;
private
LocalDateTime
timeStart
;
@ApiModelProperty
(
value
=
"票种结售时间"
,
example
=
"2020-12-01T14:00:00"
)
@ApiModelProperty
(
value
=
"票种结售时间"
,
example
=
"2020-12-01T14:00:00"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
票种结售时间
不能为空"
)
private
LocalDateTime
timeEnd
;
private
LocalDateTime
timeEnd
;
@ApiModelProperty
(
value
=
"票种说明"
,
example
=
"这是票种说明"
)
@ApiModelProperty
(
value
=
"票种说明"
,
example
=
"这是票种说明"
)
...
@@ -89,11 +89,11 @@ public class TicketCreateParam implements Serializable {
...
@@ -89,11 +89,11 @@ public class TicketCreateParam implements Serializable {
private
LocalDateTime
qrCodeShowTime
;
private
LocalDateTime
qrCodeShowTime
;
@ApiModelProperty
(
value
=
"次数"
,
example
=
"1"
)
@ApiModelProperty
(
value
=
"次数"
,
example
=
"1"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
次数
不能为空"
)
private
Integer
counts
;
private
Integer
counts
;
@ApiModelProperty
(
value
=
"是否开启缺票登记"
,
example
=
"1"
)
@ApiModelProperty
(
value
=
"是否开启缺票登记"
,
example
=
"1"
)
@NotNull
(
message
=
"不能为空"
)
@NotNull
(
message
=
"
是否开启缺票登记
不能为空"
)
private
Integer
isLackRegister
;
private
Integer
isLackRegister
;
@ApiModelProperty
(
value
=
""
,
hidden
=
true
)
@ApiModelProperty
(
value
=
""
,
hidden
=
true
)
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java
View file @
0e5faf8f
...
@@ -71,7 +71,7 @@ public class AdamMemberAdminController {
...
@@ -71,7 +71,7 @@ public class AdamMemberAdminController {
@RequiresPermissions
(
"adam:member:info"
)
@RequiresPermissions
(
"adam:member:info"
)
@ApiOperation
(
value
=
"会员卡详情"
)
@ApiOperation
(
value
=
"会员卡详情"
)
@PostMapping
(
"info"
)
@PostMapping
(
"info"
)
public
ResponseDto
<
Object
>
info
(
@NotBlank
@RequestParam
String
memberId
)
{
public
ResponseDto
<
Object
>
info
(
@NotBlank
(
message
=
"会员类型ID不能为空"
)
@RequestParam
String
memberId
)
{
return
ResponseDto
.
success
(
adamMemberService
.
getOne
(
return
ResponseDto
.
success
(
adamMemberService
.
getOne
(
Wrappers
.
lambdaQuery
(
AdamMember
.
class
).
eq
(
AdamMember:
:
getMemberId
,
memberId
)
Wrappers
.
lambdaQuery
(
AdamMember
.
class
).
eq
(
AdamMember:
:
getMemberId
,
memberId
)
));
));
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberPriceAdminController.java
View file @
0e5faf8f
...
@@ -37,7 +37,7 @@ public class AdamMemberPriceAdminController {
...
@@ -37,7 +37,7 @@ public class AdamMemberPriceAdminController {
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"memberId"
,
value
=
"会员卡ID[64]"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"memberId"
,
value
=
"会员卡ID[64]"
),
})
})
@GetMapping
(
"list"
)
@GetMapping
(
"list"
)
public
ResponseDto
<
List
<
AdamMemberPriceVo
>>
list
(
@NotBlank
@RequestParam
String
memberId
)
{
public
ResponseDto
<
List
<
AdamMemberPriceVo
>>
list
(
@NotBlank
(
message
=
"会员类型ID不能为空"
)
@RequestParam
String
memberId
)
{
List
<
AdamMemberPrice
>
list
=
adamMemberPriceService
.
list
(
List
<
AdamMemberPrice
>
list
=
adamMemberPriceService
.
list
(
Wrappers
.
lambdaQuery
(
AdamMemberPrice
.
class
).
eq
(
AdamMemberPrice:
:
getMemberId
,
memberId
)
Wrappers
.
lambdaQuery
(
AdamMemberPrice
.
class
).
eq
(
AdamMemberPrice:
:
getMemberId
,
memberId
)
);
);
...
@@ -55,7 +55,8 @@ public class AdamMemberPriceAdminController {
...
@@ -55,7 +55,8 @@ public class AdamMemberPriceAdminController {
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"memberPriceId"
,
value
=
"会员卡价格ID[64]"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"memberPriceId"
,
value
=
"会员卡价格ID[64]"
),
})
})
@GetMapping
(
"info"
)
@GetMapping
(
"info"
)
public
ResponseDto
<
AdamMemberPriceVo
>
query
(
@NotBlank
@RequestParam
String
memberId
,
@NotBlank
@RequestParam
String
memberPriceId
)
{
public
ResponseDto
<
AdamMemberPriceVo
>
query
(
@NotBlank
(
message
=
"会员类型ID不能为空"
)
@RequestParam
String
memberId
,
@NotBlank
(
message
=
"会员价格ID不能为空"
)
@RequestParam
String
memberPriceId
)
{
AdamMemberPrice
one
=
adamMemberPriceService
.
getOne
(
AdamMemberPrice
one
=
adamMemberPriceService
.
getOne
(
Wrappers
.
lambdaQuery
(
AdamMemberPrice
.
class
)
Wrappers
.
lambdaQuery
(
AdamMemberPrice
.
class
)
.
eq
(
AdamMemberPrice:
:
getMemberPriceId
,
memberPriceId
)
.
eq
(
AdamMemberPrice:
:
getMemberPriceId
,
memberPriceId
)
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamUserMemberAdminController.java
View file @
0e5faf8f
...
@@ -39,7 +39,7 @@ public class AdamUserMemberAdminController {
...
@@ -39,7 +39,7 @@ public class AdamUserMemberAdminController {
@RequiresPermissions
(
"adam:umember:blk:add"
)
@RequiresPermissions
(
"adam:umember:blk:add"
)
@ApiOperation
(
value
=
"添加会员黑名单"
)
@ApiOperation
(
value
=
"添加会员黑名单"
)
@PostMapping
(
"blk/add"
)
@PostMapping
(
"blk/add"
)
public
ResponseDto
<
List
<
String
>>
addBlack
(
@NotBlank
@RequestParam
String
opts
)
{
public
ResponseDto
<
List
<
String
>>
addBlack
(
@NotBlank
(
message
=
"会员ID不能为空"
)
@RequestParam
String
opts
)
{
String
[]
uidArr
=
opts
.
split
(
","
);
String
[]
uidArr
=
opts
.
split
(
","
);
List
<
String
>
invalidList
=
new
ArrayList
<>(),
existList
=
new
ArrayList
<>();
List
<
String
>
invalidList
=
new
ArrayList
<>(),
existList
=
new
ArrayList
<>();
for
(
String
uid
:
uidArr
)
{
for
(
String
uid
:
uidArr
)
{
...
@@ -66,7 +66,7 @@ public class AdamUserMemberAdminController {
...
@@ -66,7 +66,7 @@ public class AdamUserMemberAdminController {
@RequiresPermissions
(
"adam:umember:blk:del"
)
@RequiresPermissions
(
"adam:umember:blk:del"
)
@ApiOperation
(
value
=
"删除会员黑名单"
)
@ApiOperation
(
value
=
"删除会员黑名单"
)
@PostMapping
(
"blk/del"
)
@PostMapping
(
"blk/del"
)
public
ResponseDto
<
Object
>
delBlack
(
@NotBlank
@RequestParam
String
opts
)
{
public
ResponseDto
<
Object
>
delBlack
(
@NotBlank
(
message
=
"会员ID不能为空"
)
@RequestParam
String
opts
)
{
String
[]
uidArr
=
opts
.
split
(
","
);
String
[]
uidArr
=
opts
.
split
(
","
);
List
<
String
>
blacklist
=
(
List
<
String
>)
redisUtil
.
get
(
AdamRedisConst
.
BLK_LIST_MEMBER_UID
);
List
<
String
>
blacklist
=
(
List
<
String
>)
redisUtil
.
get
(
AdamRedisConst
.
BLK_LIST_MEMBER_UID
);
if
(!
CollectionUtils
.
isEmpty
(
blacklist
))
{
if
(!
CollectionUtils
.
isEmpty
(
blacklist
))
{
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/order/OrderSwitchAdminController.java
View file @
0e5faf8f
...
@@ -33,7 +33,8 @@ public class OrderSwitchAdminController {
...
@@ -33,7 +33,8 @@ public class OrderSwitchAdminController {
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"int"
,
name
=
"type"
,
value
=
"1退款单号 2订单号"
,
example
=
""
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"int"
,
name
=
"type"
,
value
=
"1退款单号 2订单号"
,
example
=
""
),
})
})
@PostMapping
(
"search/code"
)
@PostMapping
(
"search/code"
)
public
ResponseDto
<
Object
>
loginSmsSwitch
(
@RequestParam
@NotNull
String
code
,
@RequestParam
@NotNull
int
type
)
{
public
ResponseDto
<
Object
>
loginSmsSwitch
(
@NotNull
(
message
=
"订单号不能为空"
)
@RequestParam
String
code
,
@NotNull
(
message
=
"类型不能为空"
)
@RequestParam
int
type
)
{
String
codeNum
=
kylinOrderRefundsService
.
getOrderRefundCode
(
code
,
type
);
String
codeNum
=
kylinOrderRefundsService
.
getOrderRefundCode
(
code
,
type
);
if
(
codeNum
==
null
){
if
(
codeNum
==
null
){
return
ResponseDto
.
success
(
"未查询到"
);
return
ResponseDto
.
success
(
"未查询到"
);
...
...
liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-handler-service/src/main/java/com/liquidnet/common/exception/RestControllerAdviceHandler.java
View file @
0e5faf8f
...
@@ -50,13 +50,15 @@ public class RestControllerAdviceHandler {
...
@@ -50,13 +50,15 @@ public class RestControllerAdviceHandler {
ConstraintViolationException
ygex
=
(
ConstraintViolationException
)
rex
;
ConstraintViolationException
ygex
=
(
ConstraintViolationException
)
rex
;
ConstraintViolation
violation
=
(
ConstraintViolation
)
ygex
.
getConstraintViolations
().
toArray
()[
0
];
ConstraintViolation
violation
=
(
ConstraintViolation
)
ygex
.
getConstraintViolations
().
toArray
()[
0
];
String
violationNode
=
violation
.
getPropertyPath
().
toString
();
String
violationNode
=
violation
.
getPropertyPath
().
toString
();
String
message
=
violationNode
.
substring
(
violationNode
.
indexOf
(
"."
)
+
1
)
+
violation
.
getMessage
();
// String message = violationNode.substring(violationNode.indexOf(".") + 1) + violation.getMessage();
String
message
=
violation
.
getMessage
();
return
new
ResponseEntity
<
Error
>(
new
Error
(
ErrorCode
.
HTTP_PARAM_ERROR
.
getCode
(),
message
),
HttpStatus
.
OK
);
return
new
ResponseEntity
<
Error
>(
new
Error
(
ErrorCode
.
HTTP_PARAM_ERROR
.
getCode
(),
message
),
HttpStatus
.
OK
);
}
}
if
(
rex
instanceof
MethodArgumentNotValidException
)
{
if
(
rex
instanceof
MethodArgumentNotValidException
)
{
MethodArgumentNotValidException
ygex
=
(
MethodArgumentNotValidException
)
rex
;
MethodArgumentNotValidException
ygex
=
(
MethodArgumentNotValidException
)
rex
;
FieldError
fieldError
=
ygex
.
getBindingResult
().
getFieldErrors
().
get
(
0
);
FieldError
fieldError
=
ygex
.
getBindingResult
().
getFieldErrors
().
get
(
0
);
String
message
=
fieldError
.
getField
()
+
" "
+
fieldError
.
getDefaultMessage
();
// String message = fieldError.getField() + " " + fieldError.getDefaultMessage();
String
message
=
fieldError
.
getDefaultMessage
();
return
new
ResponseEntity
<
Error
>(
new
Error
(
ErrorCode
.
HTTP_PARAM_ERROR
.
getCode
(),
message
),
HttpStatus
.
OK
);
return
new
ResponseEntity
<
Error
>(
new
Error
(
ErrorCode
.
HTTP_PARAM_ERROR
.
getCode
(),
message
),
HttpStatus
.
OK
);
}
}
if
(
rex
instanceof
LiquidnetFeignException
)
{
if
(
rex
instanceof
LiquidnetFeignException
)
{
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamAddressesController.java
View file @
0e5faf8f
...
@@ -66,7 +66,7 @@ public class AdamAddressesController {
...
@@ -66,7 +66,7 @@ public class AdamAddressesController {
@ApiOperationSupport
(
order
=
3
)
@ApiOperationSupport
(
order
=
3
)
@ApiOperation
(
value
=
"设置默认收货地址"
)
@ApiOperation
(
value
=
"设置默认收货地址"
)
@PostMapping
(
"def/{addrId}"
)
@PostMapping
(
"def/{addrId}"
)
public
ResponseDto
<
Object
>
def
(
@NotBlank
@PathVariable
String
addrId
)
{
public
ResponseDto
<
Object
>
def
(
@NotBlank
(
message
=
"收货地址ID不能为空"
)
@PathVariable
String
addrId
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
AdamAddressesVo
vo
=
adamRdmService
.
getAddressesVoByUidAddressesId
(
currentUid
,
addrId
);
AdamAddressesVo
vo
=
adamRdmService
.
getAddressesVoByUidAddressesId
(
currentUid
,
addrId
);
...
@@ -96,7 +96,7 @@ public class AdamAddressesController {
...
@@ -96,7 +96,7 @@ public class AdamAddressesController {
@ApiOperationSupport
(
order
=
5
)
@ApiOperationSupport
(
order
=
5
)
@ApiOperation
(
value
=
"删除收货地址"
)
@ApiOperation
(
value
=
"删除收货地址"
)
@PostMapping
(
"del/{addrId}"
)
@PostMapping
(
"del/{addrId}"
)
public
ResponseDto
<
Object
>
del
(
@NotBlank
@PathVariable
String
addrId
)
{
public
ResponseDto
<
Object
>
del
(
@NotBlank
(
message
=
"收货地址ID不能为空"
)
@PathVariable
String
addrId
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
AdamAddressesVo
vo
=
adamRdmService
.
getAddressesVoByUidAddressesId
(
currentUid
,
addrId
);
AdamAddressesVo
vo
=
adamRdmService
.
getAddressesVoByUidAddressesId
(
currentUid
,
addrId
);
...
@@ -110,7 +110,7 @@ public class AdamAddressesController {
...
@@ -110,7 +110,7 @@ public class AdamAddressesController {
@ApiOperationSupport
(
order
=
6
)
@ApiOperationSupport
(
order
=
6
)
@ApiOperation
(
value
=
"收货地址详情"
)
@ApiOperation
(
value
=
"收货地址详情"
)
@PostMapping
(
"query/{id}"
)
@PostMapping
(
"query/{id}"
)
public
ResponseDto
<
AdamAddressesVo
>
query
(
@NotBlank
@PathVariable
(
name
=
"id"
)
String
addrId
)
{
public
ResponseDto
<
AdamAddressesVo
>
query
(
@NotBlank
(
message
=
"收货地址ID不能为空"
)
@PathVariable
(
name
=
"id"
)
String
addrId
)
{
AdamAddressesVo
vo
=
adamRdmService
.
getAddressesVoByUidAddressesId
(
CurrentUtil
.
getCurrentUid
(),
addrId
);
AdamAddressesVo
vo
=
adamRdmService
.
getAddressesVoByUidAddressesId
(
CurrentUtil
.
getCurrentUid
(),
addrId
);
if
(
null
!=
vo
)
{
if
(
null
!=
vo
)
{
vo
.
setPhone
(
SensitizeUtil
.
custom
(
vo
.
getPhone
(),
3
,
4
));
vo
.
setPhone
(
SensitizeUtil
.
custom
(
vo
.
getPhone
(),
3
,
4
));
...
@@ -136,8 +136,8 @@ public class AdamAddressesController {
...
@@ -136,8 +136,8 @@ public class AdamAddressesController {
@ApiOperationSupport
(
order
=
99
)
@ApiOperationSupport
(
order
=
99
)
@ApiOperation
(
value
=
"@API:收货地址"
,
notes
=
"查取用户指定收货地址详情"
)
@ApiOperation
(
value
=
"@API:收货地址"
,
notes
=
"查取用户指定收货地址详情"
)
@GetMapping
(
"query/depth"
)
@GetMapping
(
"query/depth"
)
public
ResponseDto
<
AdamAddressesVo
>
queryForDepth
(
@NotBlank
@RequestParam
String
addrId
,
public
ResponseDto
<
AdamAddressesVo
>
queryForDepth
(
@NotBlank
(
message
=
"收货地址ID不能为空"
)
@RequestParam
String
addrId
,
@NotBlank
@RequestParam
String
uid
)
{
@NotBlank
(
message
=
"用户ID不能为空"
)
@RequestParam
String
uid
)
{
AdamAddressesVo
vo
=
adamRdmService
.
getAddressesVoByUidAddressesId
(
uid
,
addrId
);
AdamAddressesVo
vo
=
adamRdmService
.
getAddressesVoByUidAddressesId
(
uid
,
addrId
);
return
null
==
vo
?
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10106"
))
:
ResponseDto
.
success
(
vo
);
return
null
==
vo
?
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10106"
))
:
ResponseDto
.
success
(
vo
);
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamCollectionController.java
View file @
0e5faf8f
...
@@ -46,7 +46,7 @@ public class AdamCollectionController {
...
@@ -46,7 +46,7 @@ public class AdamCollectionController {
@PostMapping
(
"add"
)
@PostMapping
(
"add"
)
public
ResponseDto
<
Object
>
add
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "收藏类型无效")
public
ResponseDto
<
Object
>
add
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "收藏类型无效")
@RequestParam
String
type
,
@RequestParam
String
type
,
@Size
(
min
=
1
,
max
=
64
)
@Size
(
min
=
1
,
max
=
64
,
message
=
"收藏内容ID长度限制1-64位"
)
@RequestParam
String
contentId
)
{
@RequestParam
String
contentId
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
...
@@ -72,7 +72,7 @@ public class AdamCollectionController {
...
@@ -72,7 +72,7 @@ public class AdamCollectionController {
@PostMapping
(
"del"
)
@PostMapping
(
"del"
)
public
ResponseDto
<
Object
>
del
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "收藏类型无效")
public
ResponseDto
<
Object
>
del
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "收藏类型无效")
@RequestParam
String
type
,
@RequestParam
String
type
,
@NotBlank
@RequestParam
String
contentIds
)
{
@NotBlank
(
message
=
"内容ID不能为空"
)
@RequestParam
String
contentIds
)
{
adamCollectionService
.
del
(
CurrentUtil
.
getCurrentUid
(),
type
,
contentIds
.
split
(
","
));
adamCollectionService
.
del
(
CurrentUtil
.
getCurrentUid
(),
type
,
contentIds
.
split
(
","
));
return
ResponseDto
.
success
();
return
ResponseDto
.
success
();
...
@@ -120,7 +120,7 @@ public class AdamCollectionController {
...
@@ -120,7 +120,7 @@ public class AdamCollectionController {
@GetMapping
(
"state"
)
@GetMapping
(
"state"
)
public
ResponseDto
<
Boolean
>
state
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "收藏类型无效")
public
ResponseDto
<
Boolean
>
state
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "收藏类型无效")
@RequestParam
String
type
,
@RequestParam
String
type
,
@Size
(
min
=
1
,
max
=
64
)
@Size
(
min
=
1
,
max
=
64
,
message
=
"收藏内容ID长度限制1-64位"
)
@RequestParam
String
contentId
)
{
@RequestParam
String
contentId
)
{
return
ResponseDto
.
success
(
adamCollectionService
.
queryState
(
CurrentUtil
.
getCurrentUid
(),
type
,
contentId
));
return
ResponseDto
.
success
(
adamCollectionService
.
queryState
(
CurrentUtil
.
getCurrentUid
(),
type
,
contentId
));
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamDisposedController.java
View file @
0e5faf8f
...
@@ -47,7 +47,7 @@ public class AdamDisposedController {
...
@@ -47,7 +47,7 @@ public class AdamDisposedController {
@PostMapping
(
"add"
)
@PostMapping
(
"add"
)
public
ResponseDto
<
Object
>
add
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "想去类型无效")
public
ResponseDto
<
Object
>
add
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "想去类型无效")
@RequestParam
String
type
,
@RequestParam
String
type
,
@Size
(
min
=
1
,
max
=
64
)
@Size
(
min
=
1
,
max
=
64
,
message
=
"内容ID长度限制1-64位"
)
@RequestParam
String
contentId
)
{
@RequestParam
String
contentId
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
...
@@ -74,7 +74,7 @@ public class AdamDisposedController {
...
@@ -74,7 +74,7 @@ public class AdamDisposedController {
@PostMapping
(
"del"
)
@PostMapping
(
"del"
)
public
ResponseDto
<
Object
>
del
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "想去类型无效")
public
ResponseDto
<
Object
>
del
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "想去类型无效")
@RequestParam
String
type
,
@RequestParam
String
type
,
@NotBlank
@RequestParam
String
contentIds
)
{
@NotBlank
(
message
=
"内容ID不能为空"
)
@RequestParam
String
contentIds
)
{
adamDisposedService
.
del
(
CurrentUtil
.
getCurrentUid
(),
type
,
contentIds
.
split
(
","
));
adamDisposedService
.
del
(
CurrentUtil
.
getCurrentUid
(),
type
,
contentIds
.
split
(
","
));
return
ResponseDto
.
success
();
return
ResponseDto
.
success
();
...
@@ -109,7 +109,7 @@ public class AdamDisposedController {
...
@@ -109,7 +109,7 @@ public class AdamDisposedController {
@PostMapping
(
"list/user"
)
@PostMapping
(
"list/user"
)
public
ResponseDto
<
PageInfo
<
AdamDisposedUserVo
>>
listUser
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "想去类型无效")
public
ResponseDto
<
PageInfo
<
AdamDisposedUserVo
>>
listUser
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "想去类型无效")
@RequestParam
String
type
,
@RequestParam
String
type
,
@Size
(
min
=
1
,
max
=
64
)
@Size
(
min
=
1
,
max
=
64
,
message
=
"内容ID长度限制1-64位"
)
@RequestParam
String
contentId
,
@RequestParam
String
contentId
,
@RequestParam
(
defaultValue
=
"1"
,
required
=
false
)
int
pageNo
,
@RequestParam
(
defaultValue
=
"1"
,
required
=
false
)
int
pageNo
,
@RequestParam
(
defaultValue
=
"10"
,
required
=
false
)
int
pageSize
)
{
@RequestParam
(
defaultValue
=
"10"
,
required
=
false
)
int
pageSize
)
{
...
@@ -128,7 +128,7 @@ public class AdamDisposedController {
...
@@ -128,7 +128,7 @@ public class AdamDisposedController {
@GetMapping
(
"state"
)
@GetMapping
(
"state"
)
public
ResponseDto
<
Boolean
>
state
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "想去类型无效")
public
ResponseDto
<
Boolean
>
state
(
//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "想去类型无效")
@RequestParam
String
type
,
@RequestParam
String
type
,
@Size
(
min
=
1
,
max
=
64
)
@Size
(
min
=
1
,
max
=
64
,
message
=
"内容ID长度限制1-64位"
)
@RequestParam
String
contentId
)
{
@RequestParam
String
contentId
)
{
return
ResponseDto
.
success
(
adamDisposedService
.
queryState
(
CurrentUtil
.
getCurrentUid
(),
type
,
contentId
));
return
ResponseDto
.
success
(
adamDisposedService
.
queryState
(
CurrentUtil
.
getCurrentUid
(),
type
,
contentId
));
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java
View file @
0e5faf8f
...
@@ -54,10 +54,10 @@ public class AdamEntersController {
...
@@ -54,10 +54,10 @@ public class AdamEntersController {
switch
(
parameter
.
getType
())
{
// 证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证
switch
(
parameter
.
getType
())
{
// 证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证
case
1
:
case
1
:
if
(!
Pattern
.
matches
(
LnsRegex
.
Valid
.
CN_HANZI
,
parameter
.
getName
()))
{
if
(!
Pattern
.
matches
(
LnsRegex
.
Valid
.
CN_HANZI
,
parameter
.
getName
()))
{
return
ResponseDto
.
failure
(
Error
Code
.
HTTP_PARAM_ERROR
.
getCode
(),
"姓名必须为2~20位汉字"
);
return
ResponseDto
.
failure
(
Error
Mapping
.
get
(
"10103"
)
);
}
}
if
(!
Pattern
.
matches
(
LnsRegex
.
Valid
.
CN_ID_CARD_REF
,
parameter
.
getIdCard
()))
{
if
(!
Pattern
.
matches
(
LnsRegex
.
Valid
.
CN_ID_CARD_REF
,
parameter
.
getIdCard
()))
{
return
ResponseDto
.
failure
(
Error
Code
.
HTTP_PARAM_ERROR
.
getCode
(),
"身份证号码不合规"
);
return
ResponseDto
.
failure
(
Error
Mapping
.
get
(
"10104"
)
);
}
}
break
;
break
;
case
2
:
case
2
:
...
@@ -114,7 +114,7 @@ public class AdamEntersController {
...
@@ -114,7 +114,7 @@ public class AdamEntersController {
@ApiOperationSupport
(
order
=
3
)
@ApiOperationSupport
(
order
=
3
)
@ApiOperation
(
value
=
"设置默认入场人"
)
@ApiOperation
(
value
=
"设置默认入场人"
)
@PostMapping
(
"def/{entersId}"
)
@PostMapping
(
"def/{entersId}"
)
public
ResponseDto
<
Object
>
def
(
@NotBlank
@PathVariable
String
entersId
)
{
public
ResponseDto
<
Object
>
def
(
@NotBlank
(
message
=
"入场人ID不能为空"
)
@PathVariable
String
entersId
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
AdamEntersVo
vo
=
adamRdmService
.
getEntersVoByUidEntersId
(
currentUid
,
entersId
);
AdamEntersVo
vo
=
adamRdmService
.
getEntersVoByUidEntersId
(
currentUid
,
entersId
);
...
@@ -132,7 +132,7 @@ public class AdamEntersController {
...
@@ -132,7 +132,7 @@ public class AdamEntersController {
public
ResponseDto
<
Object
>
edit
(
@RequestBody
@Valid
AdamEntersParam
parameter
)
{
public
ResponseDto
<
Object
>
edit
(
@RequestBody
@Valid
AdamEntersParam
parameter
)
{
if
(
1
==
parameter
.
getType
())
{
if
(
1
==
parameter
.
getType
())
{
if
(!
Pattern
.
matches
(
LnsRegex
.
Valid
.
CN_HANZI
,
parameter
.
getName
()))
{
if
(!
Pattern
.
matches
(
LnsRegex
.
Valid
.
CN_HANZI
,
parameter
.
getName
()))
{
return
ResponseDto
.
failure
(
Error
Code
.
HTTP_PARAM_ERROR
.
getCode
(),
"姓名必须为2~20位汉字"
);
return
ResponseDto
.
failure
(
Error
Mapping
.
get
(
"10103"
)
);
}
}
}
}
if
(
StringUtils
.
isBlank
(
parameter
.
getEntersId
()))
{
if
(
StringUtils
.
isBlank
(
parameter
.
getEntersId
()))
{
...
@@ -150,7 +150,7 @@ public class AdamEntersController {
...
@@ -150,7 +150,7 @@ public class AdamEntersController {
@ApiOperationSupport
(
order
=
5
)
@ApiOperationSupport
(
order
=
5
)
@ApiOperation
(
value
=
"删除入场人"
)
@ApiOperation
(
value
=
"删除入场人"
)
@PostMapping
(
"del/{entersId}"
)
@PostMapping
(
"del/{entersId}"
)
public
ResponseDto
<
Object
>
del
(
@NotBlank
@PathVariable
String
entersId
)
{
public
ResponseDto
<
Object
>
del
(
@NotBlank
(
message
=
"入场人ID不能为空"
)
@PathVariable
String
entersId
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
AdamEntersVo
enters
=
adamRdmService
.
getEntersVoByUidEntersId
(
currentUid
,
entersId
);
AdamEntersVo
enters
=
adamRdmService
.
getEntersVoByUidEntersId
(
currentUid
,
entersId
);
...
@@ -164,7 +164,7 @@ public class AdamEntersController {
...
@@ -164,7 +164,7 @@ public class AdamEntersController {
@ApiOperationSupport
(
order
=
6
)
@ApiOperationSupport
(
order
=
6
)
@ApiOperation
(
value
=
"入场人详情"
)
@ApiOperation
(
value
=
"入场人详情"
)
@PostMapping
(
"query"
)
@PostMapping
(
"query"
)
public
ResponseDto
<
List
<
AdamEntersVo
>>
query
(
@NotBlank
@RequestParam
String
entersIds
)
{
public
ResponseDto
<
List
<
AdamEntersVo
>>
query
(
@NotBlank
(
message
=
"入场人ID不能为空"
)
@RequestParam
String
entersIds
)
{
List
<
AdamEntersVo
>
vos
=
adamRdmService
.
getEntersVoByUidEntersIds
(
CurrentUtil
.
getCurrentUid
(),
entersIds
.
split
(
","
));
List
<
AdamEntersVo
>
vos
=
adamRdmService
.
getEntersVoByUidEntersIds
(
CurrentUtil
.
getCurrentUid
(),
entersIds
.
split
(
","
));
if
(!
CollectionUtils
.
isEmpty
(
vos
))
{
if
(!
CollectionUtils
.
isEmpty
(
vos
))
{
for
(
AdamEntersVo
vo
:
vos
)
{
for
(
AdamEntersVo
vo
:
vos
)
{
...
@@ -190,8 +190,8 @@ public class AdamEntersController {
...
@@ -190,8 +190,8 @@ public class AdamEntersController {
}
}
@GetMapping
(
"query/depth"
)
@GetMapping
(
"query/depth"
)
public
ResponseDto
<
AdamEntersVo
>
queryForDepth
(
@NotBlank
@RequestParam
String
entersId
,
public
ResponseDto
<
AdamEntersVo
>
queryForDepth
(
@NotBlank
(
message
=
"入场人ID不能为空"
)
@RequestParam
String
entersId
,
@NotBlank
@RequestParam
String
uid
)
{
@NotBlank
(
message
=
"用户ID不能为空"
)
@RequestParam
String
uid
)
{
AdamEntersVo
vo
=
adamRdmService
.
getEntersVoByUidEntersId
(
uid
,
entersId
);
AdamEntersVo
vo
=
adamRdmService
.
getEntersVoByUidEntersId
(
uid
,
entersId
);
return
null
==
vo
?
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10105"
))
:
ResponseDto
.
success
(
vo
);
return
null
==
vo
?
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10105"
))
:
ResponseDto
.
success
(
vo
);
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java
View file @
0e5faf8f
...
@@ -68,7 +68,7 @@ public class AdamMemberController {
...
@@ -68,7 +68,7 @@ public class AdamMemberController {
@ApiOperationSupport
(
order
=
99
)
@ApiOperationSupport
(
order
=
99
)
@ApiOperation
(
value
=
"@API:是否会员"
,
notes
=
"根据UID判断用户是否会员,响应参数[`data`:true-是,false-否]"
)
@ApiOperation
(
value
=
"@API:是否会员"
,
notes
=
"根据UID判断用户是否会员,响应参数[`data`:true-是,false-否]"
)
@GetMapping
(
"check/depth"
)
@GetMapping
(
"check/depth"
)
public
ResponseDto
<
Boolean
>
isMember
(
@NotBlank
@RequestParam
String
uid
)
{
public
ResponseDto
<
Boolean
>
isMember
(
@NotBlank
(
message
=
"用户ID不能为空"
)
@RequestParam
String
uid
)
{
AdamUserMemberVo
userMemberInfo
=
adamRdmService
.
getUserMemberVoByUid
(
uid
);
AdamUserMemberVo
userMemberInfo
=
adamRdmService
.
getUserMemberVoByUid
(
uid
);
return
ResponseDto
.
success
(
null
!=
userMemberInfo
&&
userMemberInfo
.
isActive
());
return
ResponseDto
.
success
(
null
!=
userMemberInfo
&&
userMemberInfo
.
isActive
());
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java
View file @
0e5faf8f
...
@@ -59,8 +59,8 @@ public class AdamMemberOrderController {
...
@@ -59,8 +59,8 @@ public class AdamMemberOrderController {
@ApiOperationSupport
(
order
=
0
)
@ApiOperationSupport
(
order
=
0
)
@ApiOperation
(
value
=
"购买会员预览"
)
@ApiOperation
(
value
=
"购买会员预览"
)
@GetMapping
(
"preview/{mno}/{id}"
)
@GetMapping
(
"preview/{mno}/{id}"
)
public
ResponseDto
<
AdamMemberOrderPreviewVo
>
preview
(
@NotBlank
@PathVariable
String
mno
,
public
ResponseDto
<
AdamMemberOrderPreviewVo
>
preview
(
@NotBlank
(
message
=
"会员类型ID不能为空"
)
@PathVariable
String
mno
,
@NotBlank
@PathVariable
String
id
)
{
@NotBlank
(
message
=
"会员价格ID不能为空"
)
@PathVariable
String
id
)
{
AdamMemberVo
memberVo
=
adamRdmService
.
getMemberVoByMemberId
(
mno
);
AdamMemberVo
memberVo
=
adamRdmService
.
getMemberVoByMemberId
(
mno
);
if
(
null
==
memberVo
)
{
if
(
null
==
memberVo
)
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10201"
));
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10201"
));
...
@@ -183,7 +183,7 @@ public class AdamMemberOrderController {
...
@@ -183,7 +183,7 @@ public class AdamMemberOrderController {
@ApiOperationSupport
(
order
=
3
)
@ApiOperationSupport
(
order
=
3
)
@ApiOperation
(
value
=
"兑换码校验"
,
notes
=
"响应参数[`code`:0-当前兑换码可用,否则不可用]"
)
@ApiOperation
(
value
=
"兑换码校验"
,
notes
=
"响应参数[`code`:0-当前兑换码可用,否则不可用]"
)
@GetMapping
(
"check/code"
)
@GetMapping
(
"check/code"
)
public
ResponseDto
<
Integer
>
checkMemberCode
(
@NotBlank
@RequestParam
String
mCode
)
{
public
ResponseDto
<
Integer
>
checkMemberCode
(
@NotBlank
(
message
=
"兑换码不能为空"
)
@RequestParam
String
mCode
)
{
AdamMemberCodeVo
vo
=
adamRdmService
.
getMemberCodeVoByCode
(
mCode
);
AdamMemberCodeVo
vo
=
adamRdmService
.
getMemberCodeVoByCode
(
mCode
);
if
(
null
==
vo
)
{
if
(
null
==
vo
)
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10207"
));
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10207"
));
...
@@ -247,7 +247,7 @@ public class AdamMemberOrderController {
...
@@ -247,7 +247,7 @@ public class AdamMemberOrderController {
@ApiOperationSupport
(
order
=
6
)
@ApiOperationSupport
(
order
=
6
)
@ApiOperation
(
value
=
"会员订单详情"
)
@ApiOperation
(
value
=
"会员订单详情"
)
@GetMapping
(
"info/{orderNo}"
)
@GetMapping
(
"info/{orderNo}"
)
public
ResponseDto
<
AdamMemberOrderVo
>
getMemberOrderList
(
@NotBlank
@PathVariable
String
orderNo
)
{
public
ResponseDto
<
AdamMemberOrderVo
>
getMemberOrderList
(
@NotBlank
(
message
=
"订单号不能为空"
)
@PathVariable
String
orderNo
)
{
AdamMemberOrderVo
mOrderVo
=
adamRdmService
.
getShotMemberOrderVoByOrderNo
(
orderNo
);
AdamMemberOrderVo
mOrderVo
=
adamRdmService
.
getShotMemberOrderVoByOrderNo
(
orderNo
);
if
(
null
!=
mOrderVo
)
{
if
(
null
!=
mOrderVo
)
{
AdamMemberVo
memberVo
=
adamRdmService
.
getMemberVoByMemberId
(
mOrderVo
.
getMemberId
());
AdamMemberVo
memberVo
=
adamRdmService
.
getMemberVoByMemberId
(
mOrderVo
.
getMemberId
());
...
@@ -265,7 +265,7 @@ public class AdamMemberOrderController {
...
@@ -265,7 +265,7 @@ public class AdamMemberOrderController {
@ApiOperationSupport
(
order
=
7
)
@ApiOperationSupport
(
order
=
7
)
@ApiOperation
(
value
=
"会员订单状态"
,
notes
=
"响应参数[`data`:0-未支付|1-已支付]"
)
@ApiOperation
(
value
=
"会员订单状态"
,
notes
=
"响应参数[`data`:0-未支付|1-已支付]"
)
@GetMapping
(
"check"
)
@GetMapping
(
"check"
)
public
ResponseDto
<
Integer
>
checkOrderResult
(
@NotBlank
@RequestParam
String
orderNo
)
{
public
ResponseDto
<
Integer
>
checkOrderResult
(
@NotBlank
(
message
=
"订单号不能为空"
)
@RequestParam
String
orderNo
)
{
AdamMemberOrderVo
memberOrderInfo
=
adamRdmService
.
getShotMemberOrderVoByOrderNo
(
orderNo
);
AdamMemberOrderVo
memberOrderInfo
=
adamRdmService
.
getShotMemberOrderVoByOrderNo
(
orderNo
);
if
(
null
==
memberOrderInfo
)
{
if
(
null
==
memberOrderInfo
)
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10211"
));
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10211"
));
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java
View file @
0e5faf8f
...
@@ -202,11 +202,14 @@ public class AdamUserController {
...
@@ -202,11 +202,14 @@ public class AdamUserController {
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"idCard"
,
value
=
"证件号"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"idCard"
,
value
=
"证件号"
),
})
})
@PostMapping
(
value
=
{
"identity"
})
@PostMapping
(
value
=
{
"identity"
})
public
ResponseDto
<
AdamRealInfoVo
>
identity
(
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
CN_HANZI
,
message
=
"姓名必须为2~20位汉字"
)
public
ResponseDto
<
AdamRealInfoVo
>
identity
(
@RequestParam
String
name
,
@RequestParam
String
idCard
)
{
@RequestParam
String
name
,
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
CN_ID_CARD_REF
,
message
=
"身份证号码不合规"
)
@RequestParam
String
idCard
)
{
log
.
debug
(
"name:{},idCard:{}"
,
name
,
idCard
);
log
.
debug
(
"name:{},idCard:{}"
,
name
,
idCard
);
if
(!
java
.
util
.
regex
.
Pattern
.
matches
(
LnsRegex
.
Valid
.
CN_HANZI
,
name
))
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10103"
));
}
if
(!
java
.
util
.
regex
.
Pattern
.
matches
(
LnsRegex
.
Valid
.
CN_ID_CARD_REF
,
idCard
))
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10104"
));
}
AdamRealInfoVo
vo
=
adamUserService
.
identity
(
CurrentUtil
.
getCurrentUid
(),
name
,
idCard
);
AdamRealInfoVo
vo
=
adamUserService
.
identity
(
CurrentUtil
.
getCurrentUid
(),
name
,
idCard
);
if
(
null
==
vo
)
{
if
(
null
==
vo
)
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10000"
));
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10000"
));
...
@@ -235,7 +238,7 @@ public class AdamUserController {
...
@@ -235,7 +238,7 @@ public class AdamUserController {
@ApiOperationSupport
(
order
=
7
)
@ApiOperationSupport
(
order
=
7
)
@ApiOperation
(
value
=
"绑定第三方账号"
)
@ApiOperation
(
value
=
"绑定第三方账号"
)
@PostMapping
(
value
=
{
"tpa/bind"
})
@PostMapping
(
value
=
{
"tpa/bind"
})
public
ResponseDto
<
List
<
AdamThirdPartInfoVo
>>
bindTpa
(
@
RequestBody
@Valid
AdamThirdPartParam
parameter
)
{
public
ResponseDto
<
List
<
AdamThirdPartInfoVo
>>
bindTpa
(
@
Valid
@RequestBody
AdamThirdPartParam
parameter
)
{
log
.
debug
(
"login by tpa:{}"
,
JsonUtils
.
toJson
(
parameter
));
log
.
debug
(
"login by tpa:{}"
,
JsonUtils
.
toJson
(
parameter
));
if
(
StringUtils
.
isBlank
(
parameter
.
getOpenId
()))
{
if
(
StringUtils
.
isBlank
(
parameter
.
getOpenId
()))
{
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties
View file @
0e5faf8f
40001
=
非法TOKEN
40001
=
登录信息有误
40002
=
被踢下线喽
40002
=
账号已在另一台设备登录
40003
=
TOKEN失效
40003
=
登录已过期
# ------------------------ 4开头错误码作系统保留
# ------------------------ 4开头错误码作系统保留
10000
=
请求频繁,稍后再试
10000
=
请求频繁,稍后再试
...
@@ -27,8 +27,8 @@
...
@@ -27,8 +27,8 @@
10101
=
姓名或身份证件号无效
10101
=
姓名或身份证件号无效
10102
=
身份证号与姓名不符
10102
=
身份证号与姓名不符
10103
=
10103
=
已超出姓名长度限制
10104
=
10104
=
身份证号码不合规
10105
=
入场人不存在
10105
=
入场人不存在
10106
=
收获地址不存在
10106
=
收获地址不存在
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java
View file @
0e5faf8f
...
@@ -76,7 +76,7 @@ public class KylinOrderTicketsController {
...
@@ -76,7 +76,7 @@ public class KylinOrderTicketsController {
@GetMapping
(
"details"
)
@GetMapping
(
"details"
)
@ApiOperation
(
"订单详情"
)
@ApiOperation
(
"订单详情"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
OrderDetailsVo
>
orderDetails
(
@RequestParam
(
value
=
"orderId"
,
required
=
false
)
@NotNull
(
message
=
"订单
id
不能为空"
)
String
orderId
)
{
public
ResponseDto
<
OrderDetailsVo
>
orderDetails
(
@RequestParam
(
value
=
"orderId"
,
required
=
false
)
@NotNull
(
message
=
"订单
ID
不能为空"
)
String
orderId
)
{
OrderDetailsVo
vo
=
orderTicketsService
.
orderDetails
(
orderId
);
OrderDetailsVo
vo
=
orderTicketsService
.
orderDetails
(
orderId
);
if
(
null
==
vo
)
{
if
(
null
==
vo
)
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20003"
));
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20003"
));
...
@@ -88,15 +88,15 @@ public class KylinOrderTicketsController {
...
@@ -88,15 +88,15 @@ public class KylinOrderTicketsController {
@GetMapping
(
"toOrderRefundDetails"
)
@GetMapping
(
"toOrderRefundDetails"
)
@ApiOperation
(
"想要退款订单详情"
)
@ApiOperation
(
"想要退款订单详情"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
KylinOrderTicketPreVo
>
toOrderRefundDetails
(
@RequestParam
(
value
=
"orderId"
,
required
=
false
)
@NotNull
(
message
=
"订单
id
不能为空"
)
String
orderId
)
{
public
ResponseDto
<
KylinOrderTicketPreVo
>
toOrderRefundDetails
(
@RequestParam
(
value
=
"orderId"
,
required
=
false
)
@NotNull
(
message
=
"订单
ID
不能为空"
)
String
orderId
)
{
return
orderTicketsService
.
toOrderRefundDetails
(
orderId
);
return
orderTicketsService
.
toOrderRefundDetails
(
orderId
);
}
}
@PostMapping
(
"sendOrderRefunds"
)
@PostMapping
(
"sendOrderRefunds"
)
@ApiOperation
(
"发起退款申请"
)
@ApiOperation
(
"发起退款申请"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
HashMap
<
String
,
String
>>
sendOrderRefund
(
@RequestParam
(
value
=
"orderId"
,
required
=
true
)
@NotNull
(
message
=
"订单
id
不能为空"
)
String
orderId
,
public
ResponseDto
<
HashMap
<
String
,
String
>>
sendOrderRefund
(
@RequestParam
(
value
=
"orderId"
,
required
=
true
)
@NotNull
(
message
=
"订单
ID
不能为空"
)
String
orderId
,
@RequestParam
(
value
=
"orderTicketEntitiesId"
,
required
=
true
)
@NotNull
(
message
=
"票单
id
不能为空"
)
String
orderTicketEntitiesId
,
@RequestParam
(
value
=
"orderTicketEntitiesId"
,
required
=
true
)
@NotNull
(
message
=
"票单
ID
不能为空"
)
String
orderTicketEntitiesId
,
@RequestParam
(
value
=
"reason"
,
required
=
true
)
@NotNull
(
message
=
"退款原因不能为空"
)
String
reason
,
@RequestParam
(
value
=
"reason"
,
required
=
true
)
@NotNull
(
message
=
"退款原因不能为空"
)
String
reason
,
@RequestParam
(
value
=
"picList"
,
required
=
false
)
String
picList
)
{
@RequestParam
(
value
=
"picList"
,
required
=
false
)
String
picList
)
{
String
orderRefundId
=
orderTicketsService
.
sendOrderRefund
(
orderId
,
orderTicketEntitiesId
,
reason
,
picList
);
String
orderRefundId
=
orderTicketsService
.
sendOrderRefund
(
orderId
,
orderTicketEntitiesId
,
reason
,
picList
);
...
@@ -112,15 +112,15 @@ public class KylinOrderTicketsController {
...
@@ -112,15 +112,15 @@ public class KylinOrderTicketsController {
@GetMapping
(
"orderRefundDetails"
)
@GetMapping
(
"orderRefundDetails"
)
@ApiOperation
(
"退款申请详情"
)
@ApiOperation
(
"退款申请详情"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
OrderRefundVo
>
orderRefundDetails
(
@RequestParam
(
value
=
"orderId"
,
required
=
true
)
@NotNull
(
message
=
"订单
id
不能为空"
)
String
orderId
,
public
ResponseDto
<
OrderRefundVo
>
orderRefundDetails
(
@RequestParam
(
value
=
"orderId"
,
required
=
true
)
@NotNull
(
message
=
"订单
ID
不能为空"
)
String
orderId
,
@RequestParam
(
value
=
"orderRefundId"
,
required
=
true
)
@NotNull
(
message
=
"退款订单
id
不能为空"
)
String
orderRefundId
)
{
@RequestParam
(
value
=
"orderRefundId"
,
required
=
true
)
@NotNull
(
message
=
"退款订单
ID
不能为空"
)
String
orderRefundId
)
{
return
orderTicketsService
.
orderRefundDetails
(
orderId
,
orderRefundId
);
return
orderTicketsService
.
orderRefundDetails
(
orderId
,
orderRefundId
);
}
}
@PostMapping
(
"orderRefundWithdraw"
)
@PostMapping
(
"orderRefundWithdraw"
)
@ApiOperation
(
"发起退款撤回"
)
@ApiOperation
(
"发起退款撤回"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
Boolean
>
orderRefundWithdraw
(
@RequestParam
(
value
=
"orderRefundId"
,
required
=
true
)
@NotNull
(
message
=
"退款订单
id
不能为空"
)
String
orderRefundId
)
{
public
ResponseDto
<
Boolean
>
orderRefundWithdraw
(
@RequestParam
(
value
=
"orderRefundId"
,
required
=
true
)
@NotNull
(
message
=
"退款订单
ID
不能为空"
)
String
orderRefundId
)
{
return
orderTicketsService
.
orderRefundWithdraw
(
orderRefundId
);
return
orderTicketsService
.
orderRefundWithdraw
(
orderRefundId
);
}
}
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/errors.properties
View file @
0e5faf8f
40001
=
非法TOKEN
40001
=
登录信息有误
40002
=
被踢下线喽
40002
=
账号已在另一台设备登录
40003
=
TOKEN失效
40003
=
登录已过期
# ------------------------ 4开头错误码作系统保留
# ------------------------ 4开头错误码作系统保留
#APP ERROR
#APP ERROR
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/KylinOrderTicketsController.java
View file @
0e5faf8f
...
@@ -76,7 +76,7 @@ public class KylinOrderTicketsController {
...
@@ -76,7 +76,7 @@ public class KylinOrderTicketsController {
@GetMapping
(
"checkPayment"
)
@GetMapping
(
"checkPayment"
)
@ApiOperation
(
"订单状态"
)
@ApiOperation
(
"订单状态"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
HashMap
>
checkOrderResult
(
@RequestParam
(
"orderId"
)
@NotNull
(
message
=
"订单
id
不能为空"
)
String
orderId
)
{
public
ResponseDto
<
HashMap
>
checkOrderResult
(
@RequestParam
(
"orderId"
)
@NotNull
(
message
=
"订单
ID
不能为空"
)
String
orderId
)
{
Integer
status
=
orderTicketsOrderService
.
checkOrderResult
(
orderId
).
getData
();
Integer
status
=
orderTicketsOrderService
.
checkOrderResult
(
orderId
).
getData
();
if
(
null
==
status
)
{
if
(
null
==
status
)
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20003"
));
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20003"
));
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/errors.properties
View file @
0e5faf8f
40001
=
非法TOKEN
40001
=
登录信息有误
40002
=
被踢下线喽
40002
=
账号已在另一台设备登录
40003
=
TOKEN失效
40003
=
登录已过期
# ------------------------ 4开头错误码作系统保留
# ------------------------ 4开头错误码作系统保留
#APP ERROR
#APP ERROR
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinCheckUserPerformancesPartnerController.java
View file @
0e5faf8f
...
@@ -46,7 +46,7 @@ public class KylinCheckUserPerformancesPartnerController {
...
@@ -46,7 +46,7 @@ public class KylinCheckUserPerformancesPartnerController {
@DeleteMapping
(
value
=
""
)
@DeleteMapping
(
value
=
""
)
@ApiOperation
(
value
=
"删除关联关系"
,
position
=
1
)
@ApiOperation
(
value
=
"删除关联关系"
,
position
=
1
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
delPerformance
(
@RequestParam
(
"performanceIds"
)
@Size
(
min
=
1
)
@NotNull
List
<
String
>
performanceIds
,
public
ResponseDto
<
String
>
delPerformance
(
@RequestParam
(
"performanceIds"
)
@Size
(
min
=
1
)
@NotNull
(
message
=
"演出ID不能为空"
)
List
<
String
>
performanceIds
,
@RequestParam
(
"checkUserId"
)
String
checkUserId
)
{
@RequestParam
(
"checkUserId"
)
String
checkUserId
)
{
return
userPerformancesPartnerService
.
delPerformance
(
performanceIds
,
checkUserId
);
return
userPerformancesPartnerService
.
delPerformance
(
performanceIds
,
checkUserId
);
}
}
...
@@ -54,10 +54,10 @@ public class KylinCheckUserPerformancesPartnerController {
...
@@ -54,10 +54,10 @@ public class KylinCheckUserPerformancesPartnerController {
@GetMapping
(
value
=
"relation"
)
@GetMapping
(
value
=
"relation"
)
@ApiOperation
(
value
=
"关联演出列表"
,
position
=
1
)
@ApiOperation
(
value
=
"关联演出列表"
,
position
=
1
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PageInfo
<
ChildPerformanceDao
>>
childPerformanceList
(
@RequestParam
(
"merchantId"
)
@NotNull
String
merchantId
,
public
ResponseDto
<
PageInfo
<
ChildPerformanceDao
>>
childPerformanceList
(
@RequestParam
(
"merchantId"
)
@NotNull
(
message
=
"商户ID不能为空"
)
String
merchantId
,
@RequestParam
(
"checkUserId"
)
@NotNull
String
checkUserId
,
@RequestParam
(
"checkUserId"
)
@NotNull
(
message
=
"验票用户ID不能为空"
)
String
checkUserId
,
@RequestParam
(
"page"
)
@NotNull
@Min
(
1
)
int
page
,
@RequestParam
(
"page"
)
@NotNull
(
message
=
"页数不能为空"
)
@Min
(
1
)
int
page
,
@RequestParam
(
"size"
)
@NotNull
@Min
(
1
)
int
size
,
@RequestParam
(
"size"
)
@NotNull
(
message
=
"数量不能为空"
)
@Min
(
1
)
int
size
,
@RequestParam
(
"name"
)
String
name
)
{
@RequestParam
(
"name"
)
String
name
)
{
return
userPerformancesPartnerService
.
childPerformanceList
(
merchantId
,
checkUserId
,
page
,
size
,
name
);
return
userPerformancesPartnerService
.
childPerformanceList
(
merchantId
,
checkUserId
,
page
,
size
,
name
);
}
}
...
@@ -65,10 +65,10 @@ public class KylinCheckUserPerformancesPartnerController {
...
@@ -65,10 +65,10 @@ public class KylinCheckUserPerformancesPartnerController {
@GetMapping
(
value
=
"unRelation"
)
@GetMapping
(
value
=
"unRelation"
)
@ApiOperation
(
value
=
"未关联演出列表"
,
position
=
1
)
@ApiOperation
(
value
=
"未关联演出列表"
,
position
=
1
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PageInfo
<
ChildPerformanceDao
>>
unChildPerformanceList
(
@RequestParam
(
"merchantId"
)
@NotNull
String
merchantId
,
public
ResponseDto
<
PageInfo
<
ChildPerformanceDao
>>
unChildPerformanceList
(
@RequestParam
(
"merchantId"
)
@NotNull
(
message
=
"商户ID不能为空"
)
String
merchantId
,
@RequestParam
(
"checkUserId"
)
@NotNull
String
checkUserId
,
@RequestParam
(
"checkUserId"
)
@NotNull
(
message
=
"验票用户ID不能为空"
)
String
checkUserId
,
@RequestParam
(
"page"
)
@NotNull
@Min
(
1
)
int
page
,
@RequestParam
(
"page"
)
@NotNull
(
message
=
"页数不能为空"
)
@Min
(
1
)
int
page
,
@RequestParam
(
"size"
)
@NotNull
@Min
(
1
)
int
size
,
@RequestParam
(
"size"
)
@NotNull
(
message
=
"数量不能为空"
)
@Min
(
1
)
int
size
,
@RequestParam
(
"name"
)
String
name
)
{
@RequestParam
(
"name"
)
String
name
)
{
return
userPerformancesPartnerService
.
unChildPerformanceList
(
merchantId
,
checkUserId
,
page
,
size
,
name
);
return
userPerformancesPartnerService
.
unChildPerformanceList
(
merchantId
,
checkUserId
,
page
,
size
,
name
);
}
}
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinTicketTimesPartnerController.java
View file @
0e5faf8f
...
@@ -42,7 +42,7 @@ public class KylinTicketTimesPartnerController {
...
@@ -42,7 +42,7 @@ public class KylinTicketTimesPartnerController {
@DeleteMapping
(
value
=
""
)
@DeleteMapping
(
value
=
""
)
@ApiOperation
(
value
=
"删除场次"
,
position
=
2
)
@ApiOperation
(
value
=
"删除场次"
,
position
=
2
)
@ApiResponse
(
response
=
KylinTicketTimesPartnerVo
.
class
,
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
response
=
KylinTicketTimesPartnerVo
.
class
,
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
deleteTimes
(
@RequestParam
(
"ticketTimesId"
)
@NotNull
String
ticketTimesId
)
{
public
ResponseDto
<
String
>
deleteTimes
(
@RequestParam
(
"ticketTimesId"
)
@NotNull
(
message
=
"场次ID不能为空"
)
String
ticketTimesId
)
{
return
ticketTimesPartnerService
.
deleteTimes
(
ticketTimesId
);
return
ticketTimesPartnerService
.
deleteTimes
(
ticketTimesId
);
}
}
...
@@ -56,7 +56,7 @@ public class KylinTicketTimesPartnerController {
...
@@ -56,7 +56,7 @@ public class KylinTicketTimesPartnerController {
@GetMapping
(
value
=
"/details"
)
@GetMapping
(
value
=
"/details"
)
@ApiOperation
(
value
=
"获取场次详情"
,
position
=
4
)
@ApiOperation
(
value
=
"获取场次详情"
,
position
=
4
)
@ApiResponse
(
response
=
KylinTicketTimesPartnerVo
.
class
,
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
response
=
KylinTicketTimesPartnerVo
.
class
,
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
KylinTicketTimesPartnerVo
>
getTimesMongo
(
@RequestParam
(
"ticketTimesId"
)
@NotNull
String
ticketTimesId
)
{
public
ResponseDto
<
KylinTicketTimesPartnerVo
>
getTimesMongo
(
@RequestParam
(
"ticketTimesId"
)
@NotNull
(
message
=
"场次ID不能为空"
)
String
ticketTimesId
)
{
KylinTicketTimesPartnerVo
result
=
null
;
KylinTicketTimesPartnerVo
result
=
null
;
result
=
ticketTimesPartnerService
.
getTimesMongo
(
ticketTimesId
);
result
=
ticketTimesPartnerService
.
getTimesMongo
(
ticketTimesId
);
if
(
null
==
result
)
{
if
(
null
==
result
)
{
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinTicketsPartnerController.java
View file @
0e5faf8f
...
@@ -49,21 +49,22 @@ public class KylinTicketsPartnerController {
...
@@ -49,21 +49,22 @@ public class KylinTicketsPartnerController {
@DeleteMapping
(
value
=
""
)
@DeleteMapping
(
value
=
""
)
@ApiOperation
(
value
=
"删除票务"
,
position
=
3
)
@ApiOperation
(
value
=
"删除票务"
,
position
=
3
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
deleteTicket
(
@RequestParam
(
"ticketsId"
)
@NotNull
String
ticketsId
)
{
public
ResponseDto
<
String
>
deleteTicket
(
@RequestParam
(
"ticketsId"
)
@NotNull
(
message
=
"票务ID不能为空"
)
String
ticketsId
)
{
return
ticketsPartnerService
.
deleteTicket
(
ticketsId
);
return
ticketsPartnerService
.
deleteTicket
(
ticketsId
);
}
}
@PostMapping
(
value
=
"/copy"
)
@PostMapping
(
value
=
"/copy"
)
@ApiOperation
(
value
=
"复制票务"
,
position
=
4
)
@ApiOperation
(
value
=
"复制票务"
,
position
=
4
)
@ApiResponse
(
response
=
KylinTicketPartnerVo
.
class
,
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
response
=
KylinTicketPartnerVo
.
class
,
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
KylinTicketPartnerVo
>
copyTicket
(
@RequestParam
(
"performancesId"
)
@NotNull
String
performancesId
,
@RequestParam
(
"ticketsId"
)
@NotNull
String
ticketsId
)
{
public
ResponseDto
<
KylinTicketPartnerVo
>
copyTicket
(
@RequestParam
(
"performancesId"
)
@NotNull
(
message
=
"演出ID不能为空"
)
String
performancesId
,
@RequestParam
(
"ticketsId"
)
@NotNull
(
message
=
"票务ID不能为空"
)
String
ticketsId
)
{
return
ticketsPartnerService
.
copyTicket
(
performancesId
,
ticketsId
);
return
ticketsPartnerService
.
copyTicket
(
performancesId
,
ticketsId
);
}
}
@GetMapping
(
value
=
"/details"
)
@GetMapping
(
value
=
"/details"
)
@ApiOperation
(
value
=
"获取票务详情"
,
position
=
5
)
@ApiOperation
(
value
=
"获取票务详情"
,
position
=
5
)
@ApiResponse
(
response
=
KylinTicketPartnerVo
.
class
,
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
response
=
KylinTicketPartnerVo
.
class
,
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
KylinTicketPartnerVo
>
getTicketsMongo
(
@RequestParam
(
"ticketsId"
)
@NotNull
String
ticketsId
)
{
public
ResponseDto
<
KylinTicketPartnerVo
>
getTicketsMongo
(
@RequestParam
(
"ticketsId"
)
@NotNull
(
message
=
"票务ID不能为空"
)
String
ticketsId
)
{
KylinTicketPartnerVo
result
=
null
;
KylinTicketPartnerVo
result
=
null
;
result
=
ticketsPartnerService
.
getTicketsMongo
(
ticketsId
);
result
=
ticketsPartnerService
.
getTicketsMongo
(
ticketsId
);
if
(
null
==
result
)
{
if
(
null
==
result
)
{
...
@@ -76,14 +77,16 @@ public class KylinTicketsPartnerController {
...
@@ -76,14 +77,16 @@ public class KylinTicketsPartnerController {
@PostMapping
(
value
=
"/onLine"
)
@PostMapping
(
value
=
"/onLine"
)
@ApiOperation
(
value
=
"票上线"
,
position
=
6
)
@ApiOperation
(
value
=
"票上线"
,
position
=
6
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
onLine
(
@RequestParam
(
"ticketsId"
)
@NotNull
String
ticketsId
,
@RequestParam
(
"performancesId"
)
@NotNull
String
performancesId
)
{
public
ResponseDto
<
String
>
onLine
(
@RequestParam
(
"ticketsId"
)
@NotNull
(
message
=
"票务ID不能为空"
)
String
ticketsId
,
@RequestParam
(
"performancesId"
)
@NotNull
(
message
=
"演出ID不能为空"
)
String
performancesId
)
{
return
ticketsPartnerService
.
onLine
(
ticketsId
,
performancesId
);
return
ticketsPartnerService
.
onLine
(
ticketsId
,
performancesId
);
}
}
@PostMapping
(
value
=
"/outLine"
)
@PostMapping
(
value
=
"/outLine"
)
@ApiOperation
(
value
=
"票下线"
,
position
=
7
)
@ApiOperation
(
value
=
"票下线"
,
position
=
7
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
outLine
(
@RequestParam
(
"ticketsId"
)
@NotNull
String
ticketsId
,
@RequestParam
(
"performancesId"
)
@NotNull
String
performancesId
)
{
public
ResponseDto
<
String
>
outLine
(
@RequestParam
(
"ticketsId"
)
@NotNull
(
message
=
"票务ID不能为空"
)
String
ticketsId
,
@RequestParam
(
"performancesId"
)
@NotNull
(
message
=
"演出ID不能为空"
)
String
performancesId
)
{
return
ticketsPartnerService
.
outLine
(
ticketsId
,
performancesId
);
return
ticketsPartnerService
.
outLine
(
ticketsId
,
performancesId
);
}
}
}
}
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/PerformancePartnerController.java
View file @
0e5faf8f
...
@@ -41,7 +41,7 @@ public class PerformancePartnerController {
...
@@ -41,7 +41,7 @@ public class PerformancePartnerController {
@PostMapping
(
value
=
"copy"
)
@PostMapping
(
value
=
"copy"
)
@ApiOperation
(
value
=
"复制演出"
,
position
=
6
)
@ApiOperation
(
value
=
"复制演出"
,
position
=
6
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
Map
<
String
,
String
>>
copyPerformance
(
@RequestParam
(
"performancesId"
)
@NotNull
String
performancesId
)
{
public
ResponseDto
<
Map
<
String
,
String
>>
copyPerformance
(
@RequestParam
(
"performancesId"
)
@NotNull
(
message
=
"演出ID不能为空"
)
String
performancesId
)
{
String
result
=
performancesPartnerService
.
copyPerformance
(
performancesId
);
String
result
=
performancesPartnerService
.
copyPerformance
(
performancesId
);
if
(
null
==
result
)
{
if
(
null
==
result
)
{
return
ResponseDto
.
failure
(
"复制失败"
);
return
ResponseDto
.
failure
(
"复制失败"
);
...
@@ -56,7 +56,7 @@ public class PerformancePartnerController {
...
@@ -56,7 +56,7 @@ public class PerformancePartnerController {
@GetMapping
(
value
=
"step1"
)
@GetMapping
(
value
=
"step1"
)
@ApiOperation
(
value
=
"获取演出第一步数据"
,
position
=
3
)
@ApiOperation
(
value
=
"获取演出第一步数据"
,
position
=
3
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PerformancePartnerVo
>
getStep1
(
@RequestParam
(
"performancesId"
)
@NotNull
String
performancesId
)
{
public
ResponseDto
<
PerformancePartnerVo
>
getStep1
(
@RequestParam
(
"performancesId"
)
@NotNull
(
message
=
"演出ID不能为空"
)
String
performancesId
)
{
return
performancesPartnerService
.
getStep1
(
performancesId
);
return
performancesPartnerService
.
getStep1
(
performancesId
);
}
}
...
@@ -87,35 +87,35 @@ public class PerformancePartnerController {
...
@@ -87,35 +87,35 @@ public class PerformancePartnerController {
@GetMapping
(
value
=
"step2"
)
@GetMapping
(
value
=
"step2"
)
@ApiOperation
(
value
=
"获取演出第二步数据"
,
position
=
5
)
@ApiOperation
(
value
=
"获取演出第二步数据"
,
position
=
5
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PerformanceStep2Param
>
getStep2
(
@RequestParam
(
"performancesId"
)
@NotNull
String
performancesId
)
{
public
ResponseDto
<
PerformanceStep2Param
>
getStep2
(
@RequestParam
(
"performancesId"
)
@NotNull
(
message
=
"演出ID不能为空"
)
String
performancesId
)
{
return
performancesPartnerService
.
getStep2
(
performancesId
);
return
performancesPartnerService
.
getStep2
(
performancesId
);
}
}
@PostMapping
(
value
=
"online"
)
@PostMapping
(
value
=
"online"
)
@ApiOperation
(
value
=
"演出上线"
,
position
=
7
)
@ApiOperation
(
value
=
"演出上线"
,
position
=
7
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
onLinePerformance
(
@RequestParam
(
"performancesId"
)
@NotNull
String
performancesId
)
{
public
ResponseDto
<
String
>
onLinePerformance
(
@RequestParam
(
"performancesId"
)
@NotNull
(
message
=
"演出ID不能为空"
)
String
performancesId
)
{
return
performancesPartnerService
.
onLinePerformance
(
performancesId
);
return
performancesPartnerService
.
onLinePerformance
(
performancesId
);
}
}
@PostMapping
(
value
=
"outline"
)
@PostMapping
(
value
=
"outline"
)
@ApiOperation
(
value
=
"演出下线"
,
position
=
8
)
@ApiOperation
(
value
=
"演出下线"
,
position
=
8
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
outLinePerformance
(
@RequestParam
(
"performancesId"
)
@NotNull
String
performancesId
)
{
public
ResponseDto
<
String
>
outLinePerformance
(
@RequestParam
(
"performancesId"
)
@NotNull
(
message
=
"演出ID不能为空"
)
String
performancesId
)
{
return
performancesPartnerService
.
outLinePerformance
(
performancesId
);
return
performancesPartnerService
.
outLinePerformance
(
performancesId
);
}
}
@PostMapping
(
value
=
"withdraw"
)
@PostMapping
(
value
=
"withdraw"
)
@ApiOperation
(
value
=
"演出撤回"
,
position
=
9
)
@ApiOperation
(
value
=
"演出撤回"
,
position
=
9
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
withdraw
(
@RequestParam
(
"performancesId"
)
@NotNull
String
performancesId
)
{
public
ResponseDto
<
String
>
withdraw
(
@RequestParam
(
"performancesId"
)
@NotNull
(
message
=
"演出ID不能为空"
)
String
performancesId
)
{
return
performancesPartnerService
.
withdraw
(
performancesId
);
return
performancesPartnerService
.
withdraw
(
performancesId
);
}
}
@GetMapping
(
value
=
"orderStatistical"
)
@GetMapping
(
value
=
"orderStatistical"
)
@ApiOperation
(
value
=
"演出订单统计"
,
position
=
9
)
@ApiOperation
(
value
=
"演出订单统计"
,
position
=
9
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
List
<
PerformanceOrderStatisticalVo
>>
performanceOrderStatisticalList
(
@RequestParam
(
"performancesId"
)
@NotNull
String
performancesId
)
{
public
ResponseDto
<
List
<
PerformanceOrderStatisticalVo
>>
performanceOrderStatisticalList
(
@RequestParam
(
"performancesId"
)
@NotNull
(
message
=
"演出ID不能为空"
)
String
performancesId
)
{
List
<
PerformanceOrderStatisticalVo
>
list
=
performancesPartnerService
.
getPerformanceOrderStatisticalList
(
performancesId
);
List
<
PerformanceOrderStatisticalVo
>
list
=
performancesPartnerService
.
getPerformanceOrderStatisticalList
(
performancesId
);
return
ResponseDto
.
success
(
list
);
return
ResponseDto
.
success
(
list
);
}
}
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/resources/errors.properties
View file @
0e5faf8f
40001
=
非法TOKEN
40001
=
登录信息有误
40002
=
被踢下线喽
40002
=
账号已在另一台设备登录
40003
=
TOKEN失效
40003
=
登录已过期
# ------------------------ 4开头错误码作系统保留
# ------------------------ 4开头错误码作系统保留
30000
=
请求频繁,稍后再试
30000
=
请求频繁,稍后再试
...
...
liquidnet-bus-support/liquidnet-support-zuul/src/main/resources/errors.properties
View file @
0e5faf8f
40001
=
非法TOKEN
40001
=
登录信息有误
40002
=
被踢下线喽
40002
=
账号已在另一台设备登录
40003
=
TOKEN失效
40003
=
登录已过期
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