记得上下班打卡 | 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
02f75308
Commit
02f75308
authored
May 11, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
24cddd8c
946dd821
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
237 additions
and
35 deletions
+237
-35
PerformanceAdminListParam.java
...et/service/kylin/dto/param/PerformanceAdminListParam.java
+26
-0
PerformancePartnerListParam.java
.../service/kylin/dto/param/PerformancePartnerListParam.java
+1
-1
IKylinPerformancesAdminService.java
...e/kylin/service/admin/IKylinPerformancesAdminService.java
+8
-0
IKylinPerformancesPartnerService.java
...lin/service/partner/IKylinPerformancesPartnerService.java
+2
-7
PerformanceAdminListDao.java
.../liquidnet/service/kylin/dao/PerformanceAdminListDao.java
+38
-0
KylinPerformances.java
...com/liquidnet/service/kylin/entity/KylinPerformances.java
+5
-0
KylinPerformancesMapper.java
...quidnet/service/kylin/mapper/KylinPerformancesMapper.java
+3
-0
KylinPerformancesMapper.xml
...iquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
+94
-0
db_kylin_structure.sql
.../liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
+1
-0
KylinPerformancesAdminController.java
...in/controller/admin/KylinPerformancesAdminController.java
+19
-4
PerformancePartnerController.java
...ylin/controller/partner/PerformancePartnerController.java
+3
-6
KylinPerformancesAdminServiceImpl.java
...service/impl/admin/KylinPerformancesAdminServiceImpl.java
+19
-0
KylinPerformancesPartnerServiceImpl.java
...ice/impl/partner/KylinPerformancesPartnerServiceImpl.java
+13
-12
KylinTicketTimesPartnerServiceImpl.java
...vice/impl/partner/KylinTicketTimesPartnerServiceImpl.java
+5
-5
No files found.
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceAdminListParam.java
0 → 100644
View file @
02f75308
package
com
.
liquidnet
.
service
.
kylin
.
dto
.
param
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
public
class
PerformanceAdminListParam
{
@ApiModelProperty
(
value
=
"演出名称"
,
example
=
""
)
private
String
title
;
@ApiModelProperty
(
value
=
"-2全部状态:-1删除;0未提交;1审核中;2审核中(自动上线);3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退"
,
example
=
"-2"
)
private
int
status
;
@ApiModelProperty
(
value
=
"城市名称"
,
example
=
""
)
private
String
cityName
;
@ApiModelProperty
(
value
=
"-2全部,0审核中,2审核拒绝"
,
example
=
"0"
)
private
int
auditStatus
;
@ApiModelProperty
(
value
=
"停售时间"
,
example
=
"2000-01-01 12:00:00"
)
private
String
stopSellTime
;
@ApiModelProperty
(
value
=
"页数"
,
example
=
"0"
)
private
int
page
;
@ApiModelProperty
(
value
=
"数量"
,
example
=
"20"
)
private
int
size
;
@ApiModelProperty
(
value
=
"排序字段"
,
hidden
=
true
)
private
String
orderItem
;
@ApiModelProperty
(
value
=
"排序方式"
,
hidden
=
true
)
private
String
orderSc
;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceListParam.java
→
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/Performance
Partner
ListParam.java
View file @
02f75308
...
...
@@ -6,7 +6,7 @@ import lombok.Data;
import
java.time.LocalDateTime
;
@Data
public
class
PerformanceListParam
{
public
class
Performance
Partner
ListParam
{
@ApiModelProperty
(
value
=
"演出名称"
,
example
=
""
)
private
String
title
;
@ApiModelProperty
(
value
=
"-2全部(不包括未提交)0未发布演出列表;3审核通过;6上线;7下架;8已结束;"
,
example
=
"0"
)
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
View file @
02f75308
package
com
.
liquidnet
.
service
.
kylin
.
service
.
admin
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.service.kylin.dao.PerformanceAdminListDao
;
import
com.liquidnet.service.kylin.dao.PerformancePartnerListDao
;
import
com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam
;
import
com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam
;
import
com.liquidnet.service.kylin.dto.vo.partner.PerformanceCreatePartnerVo
;
import
com.liquidnet.service.kylin.entity.KylinPerformances
;
...
...
@@ -17,4 +22,7 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
PerformanceCreatePartnerVo
performanceDetails
(
String
performancesId
);
boolean
performanceAudit
(
String
performancesId
,
int
status
,
String
rejectTxt
);
PageInfo
<
PerformanceAdminListDao
>
getList
(
PerformanceAdminListParam
performanceAdminListParam
);
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinPerformancesPartnerService.java
View file @
02f75308
...
...
@@ -4,16 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.service.kylin.dao.PerformancePartnerListDao
;
import
com.liquidnet.service.kylin.dto.param.PerformanceCreateParam
;
import
com.liquidnet.service.kylin.dto.param.PerformanceListParam
;
import
com.liquidnet.service.kylin.dto.param.Performance
Partner
ListParam
;
import
com.liquidnet.service.kylin.dto.param.PerformanceStep1Param
;
import
com.liquidnet.service.kylin.dto.param.PerformanceStep2Param
;
import
com.liquidnet.service.kylin.dto.vo.PerformanceVo
;
import
com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerListVo
;
import
com.liquidnet.service.kylin.entity.KylinPerformances
;
import
java.util.HashMap
;
import
java.util.List
;
/**
* <p>
* 演出 服务类
...
...
@@ -36,5 +31,5 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
boolean
outLinePerformance
(
String
performancesId
);
PageInfo
<
PerformancePartnerListDao
>
getList
(
Performance
ListParam
performance
ListParam
);
PageInfo
<
PerformancePartnerListDao
>
getList
(
Performance
PartnerListParam
performancePartner
ListParam
);
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceAdminListDao.java
0 → 100644
View file @
02f75308
package
com
.
liquidnet
.
service
.
kylin
.
dao
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
public
class
PerformanceAdminListDao
{
//演出数据
@ApiModelProperty
(
value
=
"主键id"
)
private
String
performancesId
;
@ApiModelProperty
(
value
=
"标题"
)
private
String
title
;
@ApiModelProperty
(
value
=
"开演时间"
)
private
String
timeStart
;
@ApiModelProperty
(
value
=
"主办方"
)
private
String
sponsor
;
@ApiModelProperty
(
value
=
"演出状态"
)
private
int
status
;
@ApiModelProperty
(
value
=
"提审时间"
)
private
String
auditTime
;
@ApiModelProperty
(
value
=
"提交审核状态 -1未提交审核,0提交审核,1审核通过,2审核拒绝"
)
private
int
auditStatus
;
@ApiModelProperty
(
value
=
"总库存"
)
private
int
totalGeneral
;
@ApiModelProperty
(
value
=
"销售库存"
)
private
int
saleGeneral
;
@ApiModelProperty
(
value
=
"总销售金额"
)
private
int
totalSalePrice
;
@ApiModelProperty
(
value
=
"剩余库存"
)
private
int
surplusGeneral
;
@ApiModelProperty
(
value
=
"拒绝理由"
)
private
String
rejectTxt
;
@ApiModelProperty
(
value
=
"创建时间"
)
private
String
createdAt
;
// 提审账号
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformances.java
View file @
02f75308
...
...
@@ -134,6 +134,11 @@ public class KylinPerformances implements Serializable {
*/
private
LocalDateTime
timeEnd
;
/**
* 提审时间
*/
private
LocalDateTime
auditTime
;
/**
* 拒绝理由
*/
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinPerformancesMapper.java
View file @
02f75308
package
com
.
liquidnet
.
service
.
kylin
.
mapper
;
import
com.liquidnet.service.kylin.dao.FieldMisListDao
;
import
com.liquidnet.service.kylin.dao.PerformanceAdminListDao
;
import
com.liquidnet.service.kylin.dao.PerformancePartnerListDao
;
import
com.liquidnet.service.kylin.entity.KylinPerformances
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
...
...
@@ -21,4 +22,6 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
//列表
List
<
PerformancePartnerListDao
>
partnerPerformanceList
(
Map
<
String
,
Object
>
map
);
//列表
List
<
PerformanceAdminListDao
>
misPerformanceList
(
Map
<
String
,
Object
>
map
);
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
View file @
02f75308
...
...
@@ -17,6 +17,24 @@
<result
column=
"created_at"
property=
"createdAt"
/>
</resultMap>
<resultMap
id=
"misPerformanceListResult"
type=
"com.liquidnet.service.kylin.dao.PerformanceAdminListDao"
>
<result
column=
"performances_id"
property=
"performancesId"
/>
<result
column=
"title"
property=
"title"
/>
<result
column=
"time_start"
property=
"timeStart"
/>
<result
column=
"time_end"
property=
"timeEnd"
/>
<result
column=
"total_general"
property=
"totalGeneral"
/>
<result
column=
"sale_general"
property=
"saleGeneral"
/>
<result
column=
"total_sale_price"
property=
"totalSalePrice"
/>
<result
column=
"surplus_general"
property=
"surplusGeneral"
/>
<result
column=
"status"
property=
"status"
/>
<result
column=
"audit_status"
property=
"auditStatus"
/>
<result
column=
"reject_txt"
property=
"rejectTxt"
/>
<result
column=
"sort"
property=
"sort"
/>
<result
column=
"audit_time"
property=
"auditTime"
/>
<result
column=
"sponsor"
property=
"sponsor"
/>
<result
column=
"created_at"
property=
"createdAt"
/>
</resultMap>
<!-- 列表封装 -->
<sql
id=
"partner_performance_list_Column"
>
...
...
@@ -88,4 +106,80 @@
</where>
ORDER BY #{orderItem} #{orderSc}
</select>
<!-- Mis演出列表 (不包含退票信息) -->
<select
id=
"misPerformanceList"
parameterType=
"java.util.Map"
resultMap=
"partnerPerformanceListResult"
>
SELECT
p.performances_id ,
p.sponsor,
p.audit_time,
p.sort,
p.title ,
p.time_start ,
p.time_end ,
t.total_general ,
IFNULL(ot.sale_general , 0) AS 'sale_general' ,
IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' ,
IFNULL(
(
t.total_general - ot.sale_general
) ,
0
) AS 'surplus_general' ,
ps.`status` ,
ps.audit_status ,
p.reject_txt ,
p.created_at
FROM
kylin_performances AS p
LEFT JOIN kylin_performance_status AS ps ON p.performances_id = ps.performance_id
LEFT JOIN kylin_performance_relations AS pr ON p.performances_id = pr.performance_id
LEFT JOIN(
SELECT
ttr.performance_id ,
ts.ticket_id ,
sum(ts.total_general) AS 'total_general'
FROM
kylin_ticket_status AS ts
LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id
LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id
) AS t ON p.performances_id = t.performance_id
LEFT JOIN(
SELECT
sum(ot.number) AS 'sale_general' ,
sum(ot.price_actual) AS 'total_sale_price' ,
ote.performance_id AS 'performance_id'
FROM
kylin_order_tickets AS ot
LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
WHERE
ots.`status` = 0
OR ots.`status` = 1
) AS ot ON ot.performance_id = p.performances_id
<where>
<if
test=
"title!=''"
>
AND title LIKE LIKE concat('%', #{title}, '%')
</if>
<if
test=
"cityName!=''"
>
AND city_name LIKE LIKE concat('%', #{cityName}, '%')
</if>
<if
test=
"status!='-2'"
>
AND ps.STATUS = #{status}
</if>
<if
test=
"status=='-2'"
>
AND ps.STATUS >= 3
</if>
<if
test=
"auditStatus!='-2'"
>
AND ps.audit_status = #{auditStatus}
</if>
<if
test=
"auditStatus=='-2'"
>
AND (ps.audit_status = 0 or ps.audit_status = 2)
</if>
<if
test=
"stopSellTime!=''"
>
AND p.time_end LIKE concat('%', #{stopSellTime}, '%')
</if>
</where>
ORDER BY #{orderItem} #{orderSc}
</select>
</mapper>
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
View file @
02f75308
...
...
@@ -133,6 +133,7 @@ CREATE TABLE `kylin_performances`
`notice_image`
text
DEFAULT
NULL
COMMENT
'购票须知'
,
`time_start`
datetime
NOT
NULL
DEFAULT
'2000-01-01 12:00:00'
COMMENT
'演出开始时间'
,
`time_end`
datetime
NOT
NULL
DEFAULT
'2000-01-01 12:00:00'
COMMENT
'演出结束时间'
,
`audit_time`
datetime
NOT
NULL
DEFAULT
'2000-01-01 12:00:00'
COMMENT
'提审时间'
,
`reject_txt`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'拒绝理由'
,
`sort`
int
(
11
)
NOT
NULL
DEFAULT
0
COMMENT
'权重 高则在上'
,
`comment`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'comment'
,
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinPerformancesAdminController.java
View file @
02f75308
package
com
.
liquidnet
.
service
.
kylin
.
controller
.
admin
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.service.ResponseDto
;
import
com.liquidnet.service.kylin.dao.PerformanceAdminListDao
;
import
com.liquidnet.service.kylin.dao.PerformancePartnerListDao
;
import
com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam
;
import
com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam
;
import
com.liquidnet.service.kylin.dto.vo.partner.PerformanceCreatePartnerVo
;
import
com.liquidnet.service.kylin.service.impl.admin.KylinPerformancesAdminServiceImpl
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiResponse
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
/**
* <p>
...
...
@@ -29,6 +31,19 @@ public class KylinPerformancesAdminController {
@Autowired
private
KylinPerformancesAdminServiceImpl
performancesAdminService
;
@PostMapping
(
value
=
"list"
)
@ApiOperation
(
value
=
"获取列表"
)
@ApiResponse
(
response
=
PerformanceAdminListDao
.
class
,
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PageInfo
<
PerformanceAdminListDao
>>
performanceDetails
(
@RequestBody
PerformanceAdminListParam
performanceAdminListParam
)
{
PageInfo
<
PerformanceAdminListDao
>
result
=
null
;
result
=
performancesAdminService
.
getList
(
performanceAdminListParam
);
if
(
null
!=
result
)
{
return
ResponseDto
.
success
(
result
);
}
else
{
return
ResponseDto
.
failure
(
"获取演出详情失败"
);
}
}
@GetMapping
(
value
=
"details"
)
@ApiOperation
(
value
=
"获取演出详情"
)
@ApiResponse
(
response
=
PerformanceCreatePartnerVo
.
class
,
code
=
200
,
message
=
"接口返回对象参数"
)
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/PerformancePartnerController.java
View file @
02f75308
...
...
@@ -4,10 +4,9 @@ import com.github.pagehelper.PageInfo;
import
com.liquidnet.service.ResponseDto
;
import
com.liquidnet.service.kylin.dao.PerformancePartnerListDao
;
import
com.liquidnet.service.kylin.dto.param.PerformanceCreateParam
;
import
com.liquidnet.service.kylin.dto.param.PerformanceListParam
;
import
com.liquidnet.service.kylin.dto.param.Performance
Partner
ListParam
;
import
com.liquidnet.service.kylin.dto.param.PerformanceStep1Param
;
import
com.liquidnet.service.kylin.dto.param.PerformanceStep2Param
;
import
com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerListVo
;
import
com.liquidnet.service.kylin.service.impl.partner.KylinPerformancesPartnerServiceImpl
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
...
...
@@ -15,8 +14,6 @@ import io.swagger.annotations.ApiResponse;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.HashMap
;
@Api
(
tags
=
"第三方-演出"
)
@RestController
@RequestMapping
(
"partner/performance"
)
...
...
@@ -28,9 +25,9 @@ public class PerformancePartnerController {
@PostMapping
(
value
=
"list"
)
@ApiOperation
(
value
=
"演出列表"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
PageInfo
<
PerformancePartnerListDao
>>
getList
(
@RequestBody
Performance
ListParam
performance
ListParam
)
{
public
ResponseDto
<
PageInfo
<
PerformancePartnerListDao
>>
getList
(
@RequestBody
Performance
PartnerListParam
performancePartner
ListParam
)
{
PageInfo
<
PerformancePartnerListDao
>
result
=
null
;
result
=
performancesPartnerService
.
getList
(
performanceListParam
);
result
=
performancesPartnerService
.
getList
(
performance
Partner
ListParam
);
if
(
null
==
result
)
{
return
ResponseDto
.
failure
(
"列表获取失败"
);
}
else
{
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinPerformancesAdminServiceImpl.java
View file @
02f75308
...
...
@@ -2,10 +2,16 @@ package com.liquidnet.service.kylin.service.impl.admin;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.commons.lang.util.BeanUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.service.kylin.dao.PerformanceAdminListDao
;
import
com.liquidnet.service.kylin.dao.PerformancePartnerListDao
;
import
com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam
;
import
com.liquidnet.service.kylin.dto.param.PerformanceCreateParam
;
import
com.liquidnet.service.kylin.dto.vo.partner.PerformanceCreatePartnerVo
;
import
com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartnerVo
;
...
...
@@ -167,4 +173,17 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
return
false
;
}
}
@Override
public
PageInfo
<
PerformanceAdminListDao
>
getList
(
PerformanceAdminListParam
performanceAdminListParam
)
{
PageInfo
<
PerformanceAdminListDao
>
pageInfoTmp
=
null
;
try
{
PageHelper
.
startPage
(
performanceAdminListParam
.
getPage
(),
performanceAdminListParam
.
getSize
());
List
<
PerformanceAdminListDao
>
voList
=
performancesMapper
.
misPerformanceList
(
BeanUtil
.
convertBeanToMap
(
performanceAdminListParam
));
pageInfoTmp
=
new
PageInfo
(
voList
);
}
catch
(
Exception
e
)
{
return
null
;
}
return
pageInfoTmp
;
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java
View file @
02f75308
...
...
@@ -11,10 +11,9 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst;
import
com.liquidnet.service.kylin.dao.PerformancePartnerListDao
;
import
com.liquidnet.service.kylin.dto.TicketInventoryDto
;
import
com.liquidnet.service.kylin.dto.param.PerformanceCreateParam
;
import
com.liquidnet.service.kylin.dto.param.PerformanceListParam
;
import
com.liquidnet.service.kylin.dto.param.Performance
Partner
ListParam
;
import
com.liquidnet.service.kylin.dto.param.PerformanceStep1Param
;
import
com.liquidnet.service.kylin.dto.param.PerformanceStep2Param
;
import
com.liquidnet.service.kylin.dto.vo.FieldsVo
;
import
com.liquidnet.service.kylin.dto.vo.PerformanceVo
;
import
com.liquidnet.service.kylin.dto.vo.TicketTimesVo
;
import
com.liquidnet.service.kylin.dto.vo.TicketVo
;
...
...
@@ -176,7 +175,11 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
mapSql
.
put
(
"rejectTxt"
,
""
);
mapSql
.
put
(
"status"
,
1
);
mapSql
.
put
(
"updatedAt"
,
createdAt
.
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)));
// auditTime
performanceVoTask
.
createPerformanceMySql
(
performanceId
,
mapSql
,
performanceCreatePartnerVo
,
createdAt
);
KylinPerformances
performances
=
new
KylinPerformances
();
performances
.
setAuditTime
(
LocalDateTime
.
now
());
performancesMapper
.
insert
(
performances
);
}
}
else
{
//保存
map
.
put
(
"status"
,
0
);
...
...
@@ -401,19 +404,18 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
}
@Override
public
PageInfo
<
PerformancePartnerListDao
>
getList
(
PerformanceListParam
performanceListParam
)
{
HashMap
<
String
,
Object
>
info
=
new
HashMap
<>();
int
status
=
performanceListParam
.
getStatus
();
int
page
=
performanceListParam
.
getPage
()
-
1
;
int
size
=
performanceListParam
.
getSize
();
public
PageInfo
<
PerformancePartnerListDao
>
getList
(
PerformancePartnerListParam
performancePartnerListParam
)
{
int
status
=
performancePartnerListParam
.
getStatus
();
int
page
=
performancePartnerListParam
.
getPage
()
-
1
;
int
size
=
performancePartnerListParam
.
getSize
();
PageInfo
<
PerformancePartnerListDao
>
pageInfoTmp
=
null
;
if
(
status
==
0
)
{
//未发布演出
// 排序 分页
Pageable
pageable
=
PageRequest
.
of
(
page
,
size
,
Sort
.
by
(
Sort
.
Direction
.
DESC
,
"createdAt"
));
//条件
Criteria
criteria
=
Criteria
.
where
(
"status"
).
is
(
status
);
if
(!
performanceListParam
.
getTitle
().
isEmpty
())
{
criteria
.
and
(
"title"
).
regex
(
".*?\\"
+
performanceListParam
.
getTitle
());
if
(!
performance
Partner
ListParam
.
getTitle
().
isEmpty
())
{
criteria
.
and
(
"title"
).
regex
(
".*?\\"
+
performance
Partner
ListParam
.
getTitle
());
}
Query
query
=
Query
.
query
(
criteria
);
// 查询总数
...
...
@@ -431,10 +433,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
pageInfoTmp
.
setTotal
(
count
);
}
else
{
//演出列表
try
{
PageHelper
.
startPage
(
performance
ListParam
.
getPage
(),
performance
ListParam
.
getSize
());
List
<
PerformancePartnerListDao
>
voList
=
performancesMapper
.
partnerPerformanceList
(
BeanUtil
.
convertBeanToMap
(
performanceListParam
));
PageHelper
.
startPage
(
performance
PartnerListParam
.
getPage
(),
performancePartner
ListParam
.
getSize
());
List
<
PerformancePartnerListDao
>
voList
=
performancesMapper
.
partnerPerformanceList
(
BeanUtil
.
convertBeanToMap
(
performance
Partner
ListParam
));
pageInfoTmp
=
new
PageInfo
(
voList
);
return
pageInfoTmp
;
}
catch
(
Exception
e
)
{
return
null
;
}
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketTimesPartnerServiceImpl.java
View file @
02f75308
...
...
@@ -43,8 +43,8 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
@Autowired
private
MongoTemplate
mongoTemplate
;
@Autowired
private
RedisUtil
redisUtil
;
//
@Autowired
//
private RedisUtil redisUtil;
@Autowired
private
KylinTicketTimesMapper
ticketTimesMapper
;
...
...
@@ -101,7 +101,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
);
// redis 操作
redisUtil
.
hset
(
KylinRedisConst
.
TIMES
,
ticketTimesId
,
ticketTimesCreatePartnerVo
);
//
redisUtil.hset(KylinRedisConst.TIMES, ticketTimesId, ticketTimesCreatePartnerVo);
return
ticketTimesCreatePartnerVo
;
}
...
...
@@ -130,7 +130,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
);
// redis 操作
redisUtil
.
hset
(
KylinRedisConst
.
TIMES
,
ticketTimesId
,
JsonUtils
.
fromJson
(
doc
.
toJson
(),
TicketTimesCreatePartnerVo
.
class
));
//
redisUtil.hset(KylinRedisConst.TIMES, ticketTimesId, JsonUtils.fromJson(doc.toJson(), TicketTimesCreatePartnerVo.class));
return
true
;
}
catch
(
Exception
e
)
{
...
...
@@ -175,7 +175,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
);
// redis 操作
redisUtil
.
hset
(
KylinRedisConst
.
TIMES
,
createTicketTimesParam
.
getTicketTimesId
(),
JsonUtils
.
fromJson
(
doc
.
toJson
(),
TicketTimesCreatePartnerVo
.
class
));
//
redisUtil.hset(KylinRedisConst.TIMES, createTicketTimesParam.getTicketTimesId(), JsonUtils.fromJson(doc.toJson(), TicketTimesCreatePartnerVo.class));
return
JsonUtils
.
fromJson
(
doc
.
toJson
(),
TicketTimesCreatePartnerVo
.
class
);
}
catch
(
Exception
e
){
...
...
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