记得上下班打卡 | 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
398b81e8
Commit
398b81e8
authored
May 10, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
演出 下架
parent
c4a2d03d
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
328 additions
and
30 deletions
+328
-30
PerformanceVo.java
...ava/com/liquidnet/service/kylin/dto/vo/PerformanceVo.java
+22
-2
PerformanceIgnoreVo.java
...dnet/service/kylin/dto/vo/ignore/PerformanceIgnoreVo.java
+97
-0
TicketIgnoreVo.java
...liquidnet/service/kylin/dto/vo/ignore/TicketIgnoreVo.java
+106
-0
TicketTimesIgnoreVo.java
...dnet/service/kylin/dto/vo/ignore/TicketTimesIgnoreVo.java
+37
-0
PerformancePartnerController.java
...ylin/controller/partner/PerformancePartnerController.java
+13
-2
KylinPerformancesPartnerServiceImpl.java
...ice/impl/partner/KylinPerformancesPartnerServiceImpl.java
+53
-26
No files found.
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PerformanceVo.java
View file @
398b81e8
...
@@ -4,6 +4,7 @@ import com.liquidnet.service.kylin.entity.KylinPerformanceRelations;
...
@@ -4,6 +4,7 @@ import com.liquidnet.service.kylin.entity.KylinPerformanceRelations;
import
com.liquidnet.service.kylin.entity.KylinPerformanceStatus
;
import
com.liquidnet.service.kylin.entity.KylinPerformanceStatus
;
import
com.liquidnet.service.kylin.entity.KylinPerformances
;
import
com.liquidnet.service.kylin.entity.KylinPerformances
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
jdk.nashorn.internal.ir.annotations.Ignore
;
import
lombok.Data
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
...
@@ -29,8 +30,17 @@ public class PerformanceVo {
...
@@ -29,8 +30,17 @@ public class PerformanceVo {
@ApiModelProperty
(
value
=
"开售时间"
)
@ApiModelProperty
(
value
=
"开售时间"
)
private
String
sellTime
;
private
String
sellTime
;
// @ApiModelProperty(value = "场地相关")
@ApiModelProperty
(
value
=
"城市id"
)
// private String fields;
private
String
cityId
;
@ApiModelProperty
(
value
=
"场地id"
)
private
String
fieldId
;
@ApiModelProperty
(
value
=
"场地名称"
)
private
String
fieldName
;
@ApiModelProperty
(
value
=
"搭售id"
)
private
String
projectId
;
@ApiModelProperty
(
value
=
"巡演id"
)
private
String
roadShowId
;
//@ApiModelProperty(value = "巡演相关")
//@ApiModelProperty(value = "巡演相关")
// private String roadShow;
// private String roadShow;
// OSS
// OSS
...
@@ -71,9 +81,19 @@ public class PerformanceVo {
...
@@ -71,9 +81,19 @@ public class PerformanceVo {
this
.
appStatus
=
9
;
this
.
appStatus
=
9
;
this
.
message
=
""
;
this
.
message
=
""
;
}
}
public
void
setPerformanceStatus
(
KylinPerformanceStatus
performanceStatus
)
{
public
void
setPerformanceStatus
(
KylinPerformanceStatus
performanceStatus
)
{
this
.
statusSell
=
performanceStatus
.
getStatusSell
();
this
.
statusSell
=
performanceStatus
.
getStatusSell
();
}
}
//TODO 巡演 搭售 场地
public
void
setPerformanceRelations
(
KylinPerformanceRelations
performanceRelations
)
{
this
.
fieldId
=
""
;
this
.
fieldName
=
""
;
this
.
cityId
=
""
;
this
.
projectId
=
""
;
this
.
roadShowId
=
""
;
}
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ignore/PerformanceIgnoreVo.java
0 → 100644
View file @
398b81e8
package
com
.
liquidnet
.
service
.
kylin
.
dto
.
vo
.
ignore
;
import
com.liquidnet.service.kylin.entity.KylinPerformanceRelations
;
import
com.liquidnet.service.kylin.entity.KylinPerformanceStatus
;
import
com.liquidnet.service.kylin.entity.KylinPerformances
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.time.format.DateTimeFormatter
;
@Data
public
class
PerformanceIgnoreVo
{
@ApiModelProperty
(
value
=
"主键"
)
private
String
performancesId
;
@ApiModelProperty
(
value
=
"演出名称"
)
private
String
title
;
@ApiModelProperty
(
value
=
"演出开始时间"
)
private
String
timeStart
;
@ApiModelProperty
(
value
=
"演出结束时间"
)
private
String
timeEnd
;
@ApiModelProperty
(
value
=
"停售时间"
)
private
String
stopSellTime
;
@ApiModelProperty
(
value
=
"价格"
)
private
String
price
;
@ApiModelProperty
(
value
=
"开售时间"
)
private
String
sellTime
;
@ApiModelProperty
(
value
=
"城市id"
)
private
String
cityId
;
@ApiModelProperty
(
value
=
"场地id"
)
private
String
fieldId
;
@ApiModelProperty
(
value
=
"场地名称"
)
private
String
fieldName
;
@ApiModelProperty
(
value
=
"搭售id"
)
private
String
projectId
;
@ApiModelProperty
(
value
=
"巡演id"
)
private
String
roadShowId
;
//@ApiModelProperty(value = "巡演相关")
// private String roadShow;
// OSS
// @ApiModelProperty(value = "演出详情")
// private String details;
// OSS
// @ApiModelProperty(value = "购票须知")
// private String noticeImage;
@ApiModelProperty
(
value
=
"状态"
)
private
int
appStatus
;
@ApiModelProperty
(
value
=
"是否可买"
)
private
int
statusSell
;
@ApiModelProperty
(
value
=
"是否关联会员"
)
private
int
isMember
;
@ApiModelProperty
(
value
=
"是否开启缺票登记"
)
private
int
isLackRegister
;
@ApiModelProperty
(
value
=
"是否专属"
)
private
int
isExclusive
;
@ApiModelProperty
(
value
=
"文案"
)
private
String
message
;
public
void
setPerformance
(
KylinPerformances
performance
)
{
this
.
performancesId
=
performance
.
getPerformancesId
();
this
.
title
=
performance
.
getTitle
();
this
.
timeStart
=
performance
.
getTimeStart
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
this
.
timeEnd
=
performance
.
getTimeEnd
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
}
public
void
setTimePriceVipAndLack
(
int
isLackRegister
,
int
isMember
,
int
isExclusive
,
BigDecimal
price
,
LocalDateTime
stopSellTime
,
LocalDateTime
sellTime
)
{
this
.
isLackRegister
=
isLackRegister
;
this
.
isMember
=
isMember
;
this
.
isExclusive
=
isExclusive
;
this
.
price
=
price
+
"起"
;
this
.
stopSellTime
=
stopSellTime
.
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
this
.
sellTime
=
sellTime
.
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
this
.
appStatus
=
9
;
this
.
message
=
""
;
}
public
void
setPerformanceStatus
(
KylinPerformanceStatus
performanceStatus
)
{
this
.
statusSell
=
performanceStatus
.
getStatusSell
();
}
//TODO 巡演 搭售 场地
public
void
setPerformanceRelations
(
KylinPerformanceRelations
performanceRelations
)
{
this
.
fieldId
=
""
;
this
.
fieldName
=
""
;
this
.
cityId
=
""
;
this
.
projectId
=
""
;
this
.
roadShowId
=
""
;
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ignore/TicketIgnoreVo.java
0 → 100644
View file @
398b81e8
package
com
.
liquidnet
.
service
.
kylin
.
dto
.
vo
.
ignore
;
import
com.liquidnet.service.kylin.entity.KylinTicketStatus
;
import
com.liquidnet.service.kylin.entity.KylinTickets
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.time.format.DateTimeFormatter
;
@Data
public
class
TicketIgnoreVo
{
@ApiModelProperty
(
value
=
"主键"
)
private
String
ticketsId
;
@ApiModelProperty
(
value
=
"场次id"
)
private
String
timeId
;
@ApiModelProperty
(
value
=
"名称"
)
private
String
title
;
@ApiModelProperty
(
value
=
"类型 1单日 2通票"
)
private
int
type
;
@ApiModelProperty
(
value
=
"价格"
)
private
BigDecimal
price
;
@ApiModelProperty
(
value
=
"快递费"
)
private
BigDecimal
priceExpress
;
@ApiModelProperty
(
value
=
"会员价格"
)
private
BigDecimal
memberPrice
;
@ApiModelProperty
(
value
=
"优惠价格"
)
private
BigDecimal
discountPrice
;
@ApiModelProperty
(
value
=
"票种描述"
)
private
String
describes
;
@ApiModelProperty
(
value
=
"快递票说明"
)
private
String
describeExpress
;
@ApiModelProperty
(
value
=
"电子票说明"
)
private
String
describeElectronic
;
@ApiModelProperty
(
value
=
"购票开始时间"
)
private
String
timeStart
;
@ApiModelProperty
(
value
=
"购票结束时间"
)
private
String
timeEnd
;
@ApiModelProperty
(
value
=
"会员购票开始时间"
)
private
String
memberTimeStart
;
@ApiModelProperty
(
value
=
"快递票结束时间"
)
private
String
timeEndExpress
;
@ApiModelProperty
(
value
=
"适用开始时间"
)
private
String
useStart
;
@ApiModelProperty
(
value
=
"适用结束时间"
)
private
String
useEnd
;
@ApiModelProperty
(
value
=
"开票倒计时(分钟数)"
)
private
int
saleRemindMinute
;
@ApiModelProperty
(
value
=
"是否学生票"
)
private
int
isStudent
;
@ApiModelProperty
(
value
=
"是否电子票"
)
private
int
isElectronic
;
@ApiModelProperty
(
value
=
"是否快递票"
)
private
int
isExpress
;
@ApiModelProperty
(
value
=
"状态"
)
private
int
status
;
@ApiModelProperty
(
value
=
"兑换状态"
)
private
int
statusExchange
;
@ApiModelProperty
(
value
=
"是否缺票登记"
)
private
int
isLackRegister
;
@ApiModelProperty
(
value
=
"快递状态 1寄付 2到付"
)
private
int
expressType
;
@ApiModelProperty
(
value
=
"是否实名"
)
private
int
isTrueName
;
@ApiModelProperty
(
value
=
"限购张数"
)
private
int
limitCount
;
@ApiModelProperty
(
value
=
"是否会员专属"
)
private
int
isExclusive
;
@ApiModelProperty
(
value
=
"是否会员"
)
private
int
isMember
;
public
void
setTicket
(
KylinTickets
ticket
)
{
this
.
ticketsId
=
ticket
.
getTicketsId
();
this
.
title
=
ticket
.
getTitle
();
this
.
type
=
ticket
.
getType
();
this
.
price
=
ticket
.
getPrice
();
this
.
priceExpress
=
ticket
.
getPriceExpress
();
this
.
memberPrice
=
ticket
.
getPrice
().
subtract
(
ticket
.
getPriceDiscountMember
());
this
.
discountPrice
=
ticket
.
getPrice
().
subtract
(
ticket
.
getPriceDiscount
());
this
.
describes
=
ticket
.
getDescribes
();
this
.
describeExpress
=
ticket
.
getDescribeExpress
();
this
.
describeElectronic
=
ticket
.
getDescribeElectronic
();
this
.
timeStart
=
ticket
.
getTimeStart
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
this
.
timeEnd
=
ticket
.
getTimeEnd
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
this
.
memberTimeStart
=
ticket
.
getTimeStart
().
plusMinutes
(-
ticket
.
getAdvanceMinuteMember
()).
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
this
.
timeEndExpress
=
ticket
.
getTimeEndExpress
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
this
.
useStart
=
ticket
.
getUseStart
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
this
.
useEnd
=
ticket
.
getUseEnd
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
this
.
saleRemindMinute
=
ticket
.
getSaleRemindMinute
();
}
public
void
setTicketStatus
(
KylinTicketStatus
ticketStatus
)
{
this
.
isMember
=
ticketStatus
.
getIsMember
();
this
.
isExclusive
=
ticketStatus
.
getIsExclusive
();
this
.
isTrueName
=
ticketStatus
.
getIsTrueName
();
this
.
expressType
=
ticketStatus
.
getExpressType
();
this
.
isLackRegister
=
ticketStatus
.
getIsLackRegister
();
this
.
statusExchange
=
ticketStatus
.
getStatusExchange
();
this
.
status
=
ticketStatus
.
getStatus
();
this
.
isElectronic
=
ticketStatus
.
getIsElectronic
();
this
.
isExpress
=
ticketStatus
.
getIsExpress
();
this
.
isStudent
=
ticketStatus
.
getIsStudent
();
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ignore/TicketTimesIgnoreVo.java
0 → 100644
View file @
398b81e8
package
com
.
liquidnet
.
service
.
kylin
.
dto
.
vo
.
ignore
;
import
com.liquidnet.service.kylin.entity.KylinTicketTimes
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.time.format.DateTimeFormatter
;
@Data
public
class
TicketTimesIgnoreVo
{
@ApiModelProperty
(
value
=
"主键"
)
private
String
ticketTimesId
;
@ApiModelProperty
(
value
=
"名称"
)
private
String
title
;
@ApiModelProperty
(
value
=
"类型 1单日 2通票"
)
private
int
type
;
@ApiModelProperty
(
value
=
"演出id"
)
private
String
performanceId
;
@ApiModelProperty
(
value
=
"场次id"
)
private
String
timeId
;
@ApiModelProperty
(
value
=
"适用开始时间"
)
private
String
useStart
;
@ApiModelProperty
(
value
=
"适用结束时间"
)
private
String
useEnd
;
// @ApiModelProperty(value = "票种信息集合")
// private List<TicketVo> ticketVoList;
public
void
setTicketTimes
(
KylinTicketTimes
ticketTimes
){
this
.
ticketTimesId
=
ticketTimes
.
getTicketTimesId
();
this
.
title
=
ticketTimes
.
getTitle
();
this
.
type
=
ticketTimes
.
getType
();
this
.
useStart
=
ticketTimes
.
getUseStart
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
this
.
useEnd
=
ticketTimes
.
getUseEnd
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/PerformancePartnerController.java
View file @
398b81e8
...
@@ -72,10 +72,21 @@ public class PerformancePartnerController {
...
@@ -72,10 +72,21 @@ public class PerformancePartnerController {
public
ResponseDto
<
String
>
onLinePerformance
(
@RequestParam
(
"performancesId"
)
String
performancesId
)
{
public
ResponseDto
<
String
>
onLinePerformance
(
@RequestParam
(
"performancesId"
)
String
performancesId
)
{
boolean
result
=
performancesPartnerService
.
onLinePerformance
(
performancesId
);
boolean
result
=
performancesPartnerService
.
onLinePerformance
(
performancesId
);
if
(
result
)
{
if
(
result
)
{
return
ResponseDto
.
success
(
"上
线
成功"
);
return
ResponseDto
.
success
(
"上
架
成功"
);
}
else
{
}
else
{
return
ResponseDto
.
failure
(
"上
线
失败"
);
return
ResponseDto
.
failure
(
"上
架
失败"
);
}
}
}
}
@PostMapping
(
value
=
"outline"
)
@ApiOperation
(
value
=
"演出下线"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
outLinePerformance
(
@RequestParam
(
"performancesId"
)
String
performancesId
)
{
boolean
result
=
performancesPartnerService
.
outLinePerformance
(
performancesId
);
if
(
result
)
{
return
ResponseDto
.
success
(
"下架成功"
);
}
else
{
return
ResponseDto
.
failure
(
"下架失败"
);
}
}
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java
View file @
398b81e8
This diff is collapsed.
Click to expand it.
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