记得上下班打卡 | 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
b30e657f
Commit
b30e657f
authored
May 19, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复bug
parent
cb281ddc
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
247 additions
and
94 deletions
+247
-94
KylinRedisConst.java
...com/liquidnet/service/kylin/constant/KylinRedisConst.java
+1
-1
PerformanceStep2Param.java
...uidnet/service/kylin/dto/param/PerformanceStep2Param.java
+3
-0
TicketVo.java
...ain/java/com/liquidnet/service/kylin/dto/vo/TicketVo.java
+6
-1
IKylinPerformancesAdminService.java
...e/kylin/service/admin/IKylinPerformancesAdminService.java
+31
-9
KylinTicketStatus.java
...com/liquidnet/service/kylin/entity/KylinTicketStatus.java
+5
-0
db_kylin_structure.sql
.../liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
+1
-0
pom.xml
...uidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml
+0
-5
KylinPerformancesAdminController.java
...in/controller/admin/KylinPerformancesAdminController.java
+34
-22
KylinPerformancesAdminServiceImpl.java
...service/impl/admin/KylinPerformancesAdminServiceImpl.java
+33
-2
KylinPerformancesPartnerServiceImpl.java
...ice/impl/partner/KylinPerformancesPartnerServiceImpl.java
+2
-3
KylinTicketsPartnerServiceImpl.java
.../service/impl/partner/KylinTicketsPartnerServiceImpl.java
+20
-4
PerformanceVoTask.java
.../liquidnet/service/kylin/timerTask/PerformanceVoTask.java
+111
-47
No files found.
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
View file @
b30e657f
...
...
@@ -7,7 +7,7 @@ public class KylinRedisConst {
public
static
final
String
PERFORMANCES_INVENTORY
=
"kylin:performances_inventory:ticket:"
;
public
static
final
String
SURPLUS_GENERAL
=
"surplusGeneral"
;
public
static
final
String
SURPLUS_EXCHANGE
=
"surplusExchange"
;
public
static
final
String
TICKET
=
"kylin:ticket:i
d
"
;
public
static
final
String
TICKET
=
"kylin:ticket:i
nfo
"
;
public
static
final
String
TIMES
=
"kylin:times:id"
;
public
static
final
String
BANNERS
=
"kylin:banners"
;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep2Param.java
View file @
b30e657f
...
...
@@ -28,6 +28,9 @@ public class PerformanceStep2Param implements Serializable {
@NotNull
(
message
=
"不能为空"
)
private
Integer
isSubmit
;
@ApiModelProperty
(
hidden
=
true
)
private
Integer
auditStatus
;
@ApiModelProperty
(
value
=
"场次数据"
,
hidden
=
true
)
private
List
<
TicketTimesTicketCreatePartnerVo
>
ticketTimes
;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/TicketVo.java
View file @
b30e657f
...
...
@@ -93,7 +93,11 @@ public class TicketVo {
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"
));
if
(
ticket
.
getTimeEndExpress
()!=
null
)
{
this
.
timeEndExpress
=
ticket
.
getTimeEndExpress
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
}
else
{
this
.
timeEndExpress
=
null
;
}
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
();
...
...
@@ -101,6 +105,7 @@ public class TicketVo {
public
void
setTicketStatus
(
KylinTicketStatus
ticketStatus
)
{
this
.
isMember
=
ticketStatus
.
getIsMember
();
this
.
isAgent
=
ticketStatus
.
getIsAgent
();
this
.
isExclusive
=
ticketStatus
.
getIsExclusive
();
this
.
isTrueName
=
ticketStatus
.
getIsTrueName
();
this
.
expressType
=
ticketStatus
.
getExpressType
();
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
View file @
b30e657f
...
...
@@ -26,6 +26,7 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
/**
* 获取演出详情
*
* @param performancesId 演出id
* @return PerformanceMisVo
*/
...
...
@@ -33,15 +34,17 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
/**
* 演出审核
*
* @param performancesId 演出id
* @param status 审核状态 3通过 4拒绝
* @param rejectTxt 拒绝理由 如果 status == 4 必填
* @param status
审核状态 3通过 4拒绝
* @param rejectTxt
拒绝理由 如果 status == 4 必填
* @return boolean
*/
boolean
performanceAudit
(
String
performancesId
,
int
status
,
String
rejectTxt
);
boolean
performanceAudit
(
String
performancesId
,
int
status
,
String
rejectTxt
);
/**
* 获取 演出列表 (全量)
*
* @param performanceAdminListParam 列表搜索参数
* @return 分页 sql 数据
*/
...
...
@@ -49,6 +52,7 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
/**
* 根据巡演id 查询演出列表 简易
*
* @param roadShowId 巡演id
* @return 20个 sql 数据
*/
...
...
@@ -56,6 +60,7 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
/**
* 根据演出状态 查询演出列表 简易
*
* @param status 演出状态
* @return 20个 sql 数据
*/
...
...
@@ -63,14 +68,16 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
/**
* 修改演出的巡演关联
*
* @param performancesId 演出id
* @param roadShowId 巡演id
* @param roadShowId
巡演id
* @return boolean
*/
boolean
changeRoadShowId
(
String
performancesId
,
String
roadShowId
);
boolean
changeRoadShowId
(
String
performancesId
,
String
roadShowId
);
/**
* 设置 演出推荐 关联
*
* @param performancesId 相关参数
* @return boolean
*/
...
...
@@ -78,12 +85,14 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
/**
* 查询 推荐演出列表
*
* @return 分页 sql 数据
*/
PageInfo
<
PerformanceRecommendAdminDao
>
listRecommend
();
/**
* 获取 演出会员信息(包含场次票)
*
* @param performanceId 演出id
* @return sql 数据
*/
...
...
@@ -91,6 +100,7 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
/**
* 修改 演出会员信息(包含场次票)
*
* @param performanceMemberAuditParam 相关参数
* @return boolean
*/
...
...
@@ -98,32 +108,44 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
/**
* 列表 待审核 演出会员信息
*
* @param title 标题
* @return 演出名称 id
*/
PageInfo
<
PerformanceTitleDao
>
performanceMemberList
(
String
title
,
int
page
,
int
size
);
PageInfo
<
PerformanceTitleDao
>
performanceMemberList
(
String
title
,
int
page
,
int
size
);
/**
* 详情 待审核 演出会员信息
*
* @param performanceId 演出id
* @param status 状态
* @param status
状态
* @return sql 数据
*/
PerformanceMemberAuditDao
performanceMemberAuditInfo
(
String
performanceId
,
int
status
);
PerformanceMemberAuditDao
performanceMemberAuditInfo
(
String
performanceId
,
int
status
);
//审核 会员信息
/**
* 审核演出会员相关信息
*
* @param performanceId 演出id
* @return boolean
*/
boolean
performanceMemberAudit
(
String
performanceId
,
int
status
,
String
rejectTxt
);
boolean
performanceMemberAudit
(
String
performanceId
,
int
status
,
String
rejectTxt
);
/**
* 列表 演出会员审核记录
*
* @param performanceId 演出id
* @return 分页 vo 数据
*/
PageInfo
<
PerformanceMemberAuditParam
>
performanceAuditHistory
(
String
performanceId
);
/**
* 修改 当前票种是否关联分销
* @param ticketId 票务id
* @param status 0 否 1 是
* @return
*/
boolean
changeTicketAgent
(
String
ticketId
,
Integer
status
);
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinTicketStatus.java
View file @
b30e657f
...
...
@@ -134,6 +134,11 @@ public class KylinTicketStatus implements Serializable {
*/
private
Integer
isMember
;
/**
* 是否关联代理 0不是 1是
*/
private
Integer
isAgent
;
/**
* 创建时间
*/
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
View file @
b30e657f
...
...
@@ -298,6 +298,7 @@ CREATE TABLE `kylin_ticket_status`
`is_transfer`
tinyint
NOT
NULL
DEFAULT
0
COMMENT
'是否开启转赠 0关闭 1开启'
,
`is_exclusive`
tinyint
NOT
NULL
DEFAULT
0
COMMENT
'是否会员专属 0不是 1是'
,
`is_member`
tinyint
NOT
NULL
DEFAULT
0
COMMENT
'是否关联会员 0不是 1是'
,
`is_agent`
tinyint
NOT
NULL
DEFAULT
0
COMMENT
'是否关联代理 0不是 1是'
,
`created_at`
datetime
NULL
DEFAULT
NULL
COMMENT
'创建时间'
,
`updated_at`
datetime
NULL
DEFAULT
NULL
COMMENT
'修改时间'
,
KEY
`kylin_ticket_status_uid_index`
(
`ticket_status_id`
),
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml
View file @
b30e657f
...
...
@@ -37,11 +37,6 @@
<artifactId>
spring-boot-starter-data-mongodb
</artifactId>
</dependency>
<dependency>
<groupId>
org.gavaghan
</groupId>
<artifactId>
geodesy
</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinPerformancesAdminController.java
View file @
b30e657f
...
...
@@ -30,7 +30,7 @@ import java.util.List;
* @author liquidnet
* @since 2021-05-05
*/
@Api
(
tags
=
"后端-演出"
,
position
=
2001
)
@Api
(
tags
=
"后端-演出"
,
position
=
2001
)
@RestController
@RequestMapping
(
"admin/performance"
)
public
class
KylinPerformancesAdminController
{
...
...
@@ -39,7 +39,7 @@ public class KylinPerformancesAdminController {
private
KylinPerformancesAdminServiceImpl
performancesAdminService
;
@PostMapping
(
value
=
"list"
)
@ApiOperation
(
value
=
"获取列表"
,
position
=
1
)
@ApiOperation
(
value
=
"获取列表"
,
position
=
1
)
@ApiResponse
(
response
=
PerformanceAdminListDao
.
class
,
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PageInfo
<
PerformanceAdminListDao
>>
getList
(
@RequestBody
@Valid
PerformanceAdminListParam
performanceAdminListParam
)
{
PageInfo
<
PerformanceAdminListDao
>
result
=
null
;
...
...
@@ -52,7 +52,7 @@ public class KylinPerformancesAdminController {
}
@GetMapping
(
value
=
"details"
)
@ApiOperation
(
value
=
"获取演出详情"
,
position
=
2
)
@ApiOperation
(
value
=
"获取演出详情"
,
position
=
2
)
@ApiResponse
(
response
=
PerformanceMisVo
.
class
,
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PerformanceMisVo
>
performanceDetails
(
@RequestParam
(
"performancesId"
)
String
performancesId
)
{
PerformanceMisVo
result
=
null
;
...
...
@@ -65,7 +65,7 @@ public class KylinPerformancesAdminController {
}
@PostMapping
(
value
=
"audit"
)
@ApiOperation
(
value
=
"演出审核"
,
position
=
3
)
@ApiOperation
(
value
=
"演出审核"
,
position
=
3
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
performanceAudit
(
@RequestParam
(
"performancesId"
)
String
performancesId
,
@RequestParam
(
"status"
)
int
status
,
@RequestParam
(
value
=
"rejectTxt"
,
required
=
false
)
String
rejectTxt
)
{
boolean
result
=
performancesAdminService
.
performanceAudit
(
performancesId
,
status
,
rejectTxt
);
...
...
@@ -77,7 +77,7 @@ public class KylinPerformancesAdminController {
}
@GetMapping
(
value
=
"list/roadshow"
)
@ApiOperation
(
value
=
"列表根据巡演id"
,
position
=
4
)
@ApiOperation
(
value
=
"列表根据巡演id"
,
position
=
4
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
List
<
PerformanceTitleDao
>>
getListByRoadShowId
(
@RequestParam
(
"roadShowId"
)
String
roadShowId
)
{
List
<
PerformanceTitleDao
>
result
=
performancesAdminService
.
getListByRoadShowId
(
roadShowId
);
...
...
@@ -89,7 +89,7 @@ public class KylinPerformancesAdminController {
}
@GetMapping
(
value
=
"list/status"
)
@ApiOperation
(
value
=
"列表根据演出状态"
,
position
=
5
)
@ApiOperation
(
value
=
"列表根据演出状态"
,
position
=
5
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
List
<
PerformanceTitleDao
>>
getListByStatus
(
@RequestParam
(
"status"
)
String
status
)
{
List
<
PerformanceTitleDao
>
result
=
performancesAdminService
.
getListByStatus
(
status
);
...
...
@@ -101,7 +101,7 @@ public class KylinPerformancesAdminController {
}
@GetMapping
(
value
=
"roadShow/relation"
)
@ApiOperation
(
value
=
"修改演出巡演关联"
,
position
=
6
)
@ApiOperation
(
value
=
"修改演出巡演关联"
,
position
=
6
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
changeRoadShowId
(
@RequestParam
(
"performanceId"
)
String
performanceId
,
@RequestParam
(
"roadShowId"
)
String
roadShowId
)
{
boolean
result
=
performancesAdminService
.
changeRoadShowId
(
performanceId
,
roadShowId
);
...
...
@@ -112,8 +112,8 @@ public class KylinPerformancesAdminController {
}
}
@PutMapping
(
value
=
"
performance/
recommend"
)
@ApiOperation
(
value
=
"演出推荐编辑"
,
position
=
7
)
@PutMapping
(
value
=
"recommend"
)
@ApiOperation
(
value
=
"演出推荐编辑"
,
position
=
7
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
setRecommend
(
@RequestBody
@Valid
List
<
PerformanceRecommendAdminParam
>
performanceRecommendAdminParam
)
{
boolean
result
=
performancesAdminService
.
setRecommend
(
performanceRecommendAdminParam
);
...
...
@@ -124,8 +124,8 @@ public class KylinPerformancesAdminController {
}
}
@GetMapping
(
value
=
"
performance/
recommend/list"
)
@ApiOperation
(
value
=
"演出推荐列表"
,
position
=
8
)
@GetMapping
(
value
=
"recommend/list"
)
@ApiOperation
(
value
=
"演出推荐列表"
,
position
=
8
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PageInfo
<
PerformanceRecommendAdminDao
>>
listRecommend
()
{
PageInfo
<
PerformanceRecommendAdminDao
>
result
=
performancesAdminService
.
listRecommend
();
...
...
@@ -136,8 +136,8 @@ public class KylinPerformancesAdminController {
}
}
@GetMapping
(
value
=
"
performance/
member/details"
)
@ApiOperation
(
value
=
"演出会员信息"
,
position
=
9
)
@GetMapping
(
value
=
"member/details"
)
@ApiOperation
(
value
=
"演出会员信息"
,
position
=
9
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PerformanceMemberAuditDao
>
performanceMemberInfo
(
@RequestParam
(
"performanceId"
)
@NotNull
String
performanceId
)
{
PerformanceMemberAuditDao
result
=
performancesAdminService
.
performanceMemberInfo
(
performanceId
);
...
...
@@ -148,8 +148,8 @@ public class KylinPerformancesAdminController {
}
}
@PutMapping
(
value
=
"
performance/
member/change"
)
@ApiOperation
(
value
=
"修改演出会员数据"
,
position
=
10
)
@PutMapping
(
value
=
"member/change"
)
@ApiOperation
(
value
=
"修改演出会员数据"
,
position
=
10
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
performanceMemberChange
(
@RequestBody
PerformanceMemberAuditParam
performanceMemberAuditParam
)
{
boolean
result
=
performancesAdminService
.
performanceMemberChange
(
performanceMemberAuditParam
);
...
...
@@ -160,8 +160,8 @@ public class KylinPerformancesAdminController {
}
}
@GetMapping
(
value
=
"
performance/
member/list"
)
@ApiOperation
(
value
=
"待审核会员演出列表"
,
position
=
11
)
@GetMapping
(
value
=
"member/list"
)
@ApiOperation
(
value
=
"待审核会员演出列表"
,
position
=
11
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PageInfo
<
PerformanceTitleDao
>>
performanceMemberList
(
@RequestParam
(
"title"
)
@NotNull
String
title
,
@RequestParam
(
"page"
)
@NotNull
int
page
,
...
...
@@ -174,8 +174,8 @@ public class KylinPerformancesAdminController {
}
}
@GetMapping
(
value
=
"
performance/
member/details/audit"
)
@ApiOperation
(
value
=
"演出会员信息(根据status 1待审核 2已拒绝 3已通过)"
,
position
=
12
)
@GetMapping
(
value
=
"member/details/audit"
)
@ApiOperation
(
value
=
"演出会员信息(根据status 1待审核 2已拒绝 3已通过)"
,
position
=
12
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PerformanceMemberAuditDao
>
performanceMemberAuditInfo
(
@RequestParam
(
"performanceId"
)
@NotNull
String
performanceId
,
@RequestParam
(
value
=
"status"
)
@NotNull
int
status
)
{
...
...
@@ -187,8 +187,8 @@ public class KylinPerformancesAdminController {
}
}
@PostMapping
(
value
=
"
performance/
member/audit"
)
@ApiOperation
(
value
=
"审核演出会员信息"
,
position
=
13
)
@PostMapping
(
value
=
"member/audit"
)
@ApiOperation
(
value
=
"审核演出会员信息"
,
position
=
13
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
performanceMemberAudit
(
@RequestParam
(
"performanceId"
)
@NotNull
String
performanceId
,
@RequestParam
(
"status"
)
@NotNull
int
status
,
...
...
@@ -201,7 +201,7 @@ public class KylinPerformancesAdminController {
}
}
@PostMapping
(
value
=
"
performance/
member/history"
)
@PostMapping
(
value
=
"member/history"
)
@ApiOperation
(
value
=
"会员审核记录"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PageInfo
<
PerformanceMemberAuditParam
>>
performanceAuditHistory
(
@RequestParam
(
"performanceId"
)
@NotNull
String
performanceId
)
{
...
...
@@ -212,4 +212,16 @@ public class KylinPerformancesAdminController {
return
ResponseDto
.
failure
(
"操作失败"
);
}
}
@PostMapping
(
value
=
"ticket/agent"
)
@ApiOperation
(
value
=
"修改票分销状态"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
String
>
changeTicketAgent
(
@RequestParam
(
"ticketId"
)
@NotNull
String
ticketId
,
@RequestParam
(
"status"
)
@NotNull
Integer
status
)
{
boolean
result
=
performancesAdminService
.
changeTicketAgent
(
ticketId
,
status
);
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/admin/KylinPerformancesAdminServiceImpl.java
View file @
b30e657f
...
...
@@ -23,6 +23,7 @@ import com.mongodb.BasicDBObject;
import
com.mongodb.client.model.FindOneAndUpdateOptions
;
import
com.mongodb.client.model.ReturnDocument
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.pool2.BaseObject
;
import
org.bson.Document
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.PageRequest
;
...
...
@@ -163,7 +164,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
performanceVoTask
.
performanceVoStatus
(
performancesId
);
}
}
redisUtil
.
hdel
(
KylinRedisConst
.
PERFORMANCES
,
performancesId
);
}
else
if
(
status
==
4
)
{
log
.
info
(
" PERFORMANCE 演出审核 拒绝"
);
auditStatus
=
2
;
...
...
@@ -251,6 +252,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
Query
.
query
(
Criteria
.
where
(
"performancesId"
).
is
(
performancesId
)).
getQueryObject
(),
object
);
redisUtil
.
hdel
(
KylinRedisConst
.
PERFORMANCES
,
performancesId
);
return
true
;
}
catch
(
Exception
e
)
{
return
false
;
...
...
@@ -443,7 +445,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
}
performanceVoTask
.
performanceVoStatus
(
performanceId
);
redisUtil
.
hdel
(
KylinRedisConst
.
PERFORMANCES
,
performanceId
);
HashMap
<
String
,
Object
>
map2
=
new
HashMap
<>();
map2
.
put
(
"status"
,
3
);
map2
.
put
(
"updatedAt"
,
updatedAt
);
...
...
@@ -495,4 +497,33 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
return
pageInfoTmp
;
}
@Override
public
boolean
changeTicketAgent
(
String
ticketId
,
Integer
status
)
{
try
{
LocalDateTime
updatedAt
=
LocalDateTime
.
now
();
if
(
status
!=
0
&&
status
!=
1
)
{
return
false
;
}
//修改 mysql
KylinTicketStatus
ticketStatus
=
new
KylinTicketStatus
();
ticketStatus
.
setUpdatedAt
(
updatedAt
);
ticketStatus
.
setIsAgent
(
status
);
ticketStatusMapper
.
update
(
ticketStatus
,
new
UpdateWrapper
<
KylinTicketStatus
>().
eq
(
"ticket_id"
,
ticketId
));
//修改 mongo
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"updatedAt"
,
updatedAt
.
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)));
map
.
put
(
"isAgent"
,
status
);
BasicDBObject
object
=
new
BasicDBObject
(
"$set"
,
mongoConverter
.
convertToMongoType
(
map
));
mongoTemplate
.
getCollection
(
TicketVo
.
class
.
getSimpleName
()).
updateOne
(
Query
.
query
(
Criteria
.
where
(
"ticketsId"
).
is
(
ticketId
)).
getQueryObject
(),
object
);
redisUtil
.
hdel
(
KylinRedisConst
.
TICKET
,
ticketId
);
return
true
;
}
catch
(
Exception
e
)
{
return
false
;
}
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java
View file @
b30e657f
...
...
@@ -418,7 +418,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
@Override
public
ResponseDto
<
PerformanceStep2Param
>
getStep2
(
String
performancesId
)
{
PerformanceStep2Param
performanceCreatePartnerVo
=
null
;
PerformancePartnerVo
data
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"performancesId"
).
is
(
performancesId
)),
PerformancePartnerVo
.
class
,
PerformancePartnerVo
.
class
.
getSimpleName
()
);
...
...
@@ -439,9 +438,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
PerformanceStep2Param
performanceStep2Param
=
new
PerformanceStep2Param
();
BeanUtils
.
copyProperties
(
data
,
performanceStep2Param
);
performanceStep2Param
.
setTicketTimes
(
ticketTimesTicketCreatePartnerVoList
);
performanceCreatePartnerVo
=
performanceStep2Param
;
// performanceStep2Param.setAuditStatus()
;
log
.
info
(
" PERFORMANCE 演出第二步 获取"
);
return
ResponseDto
.
success
(
performance
CreatePartnerVo
);
return
ResponseDto
.
success
(
performance
Step2Param
);
}
@Override
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @
b30e657f
...
...
@@ -326,17 +326,24 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
ticketStatusMapper
.
update
(
changeStatus
,
new
UpdateWrapper
<
KylinTicketStatus
>().
eq
(
"ticket_id"
,
ticketsId
));
// mongo 操作
KylinTicketStatus
ticketStatusM
ongo
=
ticketStatusMapper
.
selectOne
(
new
UpdateWrapper
<
KylinTicketStatus
>().
eq
(
"ticket_id"
,
ticketsId
).
between
(
"status"
,
1
,
10
).
ne
(
"status"
,
7
));
KylinTicketStatus
ticketStatusM
ySql
=
ticketStatusMapper
.
selectOne
(
new
UpdateWrapper
<
KylinTicketStatus
>().
eq
(
"ticket_id"
,
ticketsId
).
between
(
"status"
,
1
,
10
).
ne
(
"status"
,
7
));
KylinTicketRelations
ticketRelation
=
ticketRelationsMapper
.
selectOne
(
new
UpdateWrapper
<
KylinTicketRelations
>().
eq
(
"ticket_id"
,
ticketsId
));
KylinTickets
tickets
=
ticketsMapper
.
selectOne
(
new
UpdateWrapper
<
KylinTickets
>().
eq
(
"tickets_id"
,
ticketsId
)
new
UpdateWrapper
<
KylinTickets
>().
eq
(
"tickets_id"
,
ticketsId
)
);
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"status"
,
6
);
BasicDBObject
object
=
new
BasicDBObject
(
"$set"
,
mongoConverter
.
convertToMongoType
(
map
));
mongoTemplate
.
getCollection
(
TicketPartnerVo
.
class
.
getSimpleName
()).
updateOne
(
Query
.
query
(
Criteria
.
where
(
"ticketsId"
).
is
(
ticketsId
)).
getQueryObject
(),
object
);
TicketVo
ticketVo
=
new
TicketVo
();
ticketVo
.
setTimeId
(
ticketRelation
.
getTimesId
());
ticketVo
.
setTicket
(
tickets
);
ticketVo
.
setTicketStatus
(
ticketStatusM
ongo
);
ticketVo
.
setTicketStatus
(
ticketStatusM
ySql
);
boolean
ticketExists
=
mongoTemplate
.
exists
(
Query
.
query
(
Criteria
.
where
(
"ticketsId"
).
is
(
ticketVo
.
getTicketsId
())),
TicketVo
.
class
,
TicketVo
.
class
.
getSimpleName
());
...
...
@@ -366,6 +373,15 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
changeStatus
.
setStatus
(
7
);
ticketStatusMapper
.
update
(
changeStatus
,
new
UpdateWrapper
<
KylinTicketStatus
>().
eq
(
"ticket_id"
,
ticketsId
));
// mongo 操作
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"status"
,
7
);
BasicDBObject
object
=
new
BasicDBObject
(
"$set"
,
mongoConverter
.
convertToMongoType
(
map
));
mongoTemplate
.
getCollection
(
TicketPartnerVo
.
class
.
getSimpleName
()).
updateOne
(
Query
.
query
(
Criteria
.
where
(
"ticketsId"
).
is
(
ticketsId
)).
getQueryObject
(),
object
);
TicketVo
ticketVoItem
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"ticketsId"
).
is
(
ticketsId
)),
TicketVo
.
class
,
TicketVo
.
class
.
getSimpleName
());
TicketIgnoreVo
ticketIgnoreVo
=
new
TicketIgnoreVo
();
BeanUtils
.
copyProperties
(
ticketVoItem
,
ticketIgnoreVo
);
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java
View file @
b30e657f
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