记得上下班打卡 | 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
f266fad7
Commit
f266fad7
authored
Mar 22, 2022
by
GaoHu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
exit
parent
f9b4d281
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
200 additions
and
11 deletions
+200
-11
SmileShowController.java
...in/web/controller/zhengzai/smile/SmileShowController.java
+10
-5
SmileUserController.java
...in/web/controller/zhengzai/smile/SmileUserController.java
+13
-4
ShowAgentVo.java
...iquidnet/client/admin/zhengzai/smile/dto/ShowAgentVo.java
+40
-0
ShowTicketVo.java
...quidnet/client/admin/zhengzai/smile/dto/ShowTicketVo.java
+21
-0
ShowVoById.java
...liquidnet/client/admin/zhengzai/smile/dto/ShowVoById.java
+75
-0
SmileShowServiceImpl.java
...min/zhengzai/smile/service/impl/SmileShowServiceImpl.java
+30
-2
KylinOrderTicketsMapper.java
...quidnet/service/kylin/mapper/KylinOrderTicketsMapper.java
+2
-0
KylinOrderTicketsMapper.xml
...iquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
+9
-0
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileShowController.java
View file @
f266fad7
...
...
@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile;
import
com.liquidnet.client.admin.common.core.domain.AjaxResult
;
import
com.liquidnet.client.admin.common.core.page.TableDataInfo
;
import
com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort
;
import
com.liquidnet.client.admin.zhengzai.smile.dto.ShowVo
;
import
com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam
;
...
...
@@ -27,26 +28,30 @@ public class SmileShowController {
@PostMapping
(
"/list"
)
@ApiOperation
(
"演出列表"
)
@ResponseBody
public
AjaxResult
schoolList
(
SmileShowParam
smileShowParam
)
{
public
TableDataInfo
schoolList
(
SmileShowParam
smileShowParam
)
{
List
<
ShowVo
>
list
=
smileShowService
.
listShow
(
smileShowParam
);
return
AjaxResult
.
success
(
list
);
TableDataInfo
rspData
=
new
TableDataInfo
();
// rspData.setCode(0);
// rspData.setRows(list.getList());
// rspData.setTotal(list.getTotal());
return
rspData
;
}
@GetMapping
(
"/getShowById"
)
@ApiOperation
(
"根据演出id查询演出详情"
)
public
AjaxResult
getShowById
(
String
performancesId
){
public
AjaxResult
getShowById
(
String
performancesId
)
{
return
smileShowService
.
getShowById
(
performancesId
);
}
@PostMapping
(
"/sort"
)
@ApiOperation
(
"演出排序"
)
public
AjaxResult
sort
(
ShowSort
showSort
){
public
AjaxResult
sort
(
ShowSort
showSort
)
{
return
smileShowService
.
sort
(
showSort
);
}
@PostMapping
(
"/make"
)
@ApiOperation
(
"打款"
)
public
AjaxResult
make
(
String
performancesId
){
public
AjaxResult
make
(
String
performancesId
)
{
return
smileShowService
.
make
(
performancesId
);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserController.java
View file @
f266fad7
...
...
@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.client.admin.common.core.controller.BaseController
;
import
com.liquidnet.client.admin.common.core.domain.AjaxResult
;
import
com.liquidnet.client.admin.common.core.page.TableDataInfo
;
import
com.liquidnet.client.admin.zhengzai.smile.dto.*
;
import
com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService
;
import
com.liquidnet.service.smile.entity.SmileUser
;
...
...
@@ -34,9 +35,13 @@ public class SmileUserController extends BaseController {
@PostMapping
(
"/list"
)
@ApiOperation
(
value
=
"获取用户列表"
)
@ResponseBody
public
AjaxResult
userList
(
SmileUserParam
smileUserParam
)
{
public
TableDataInfo
userList
(
SmileUserParam
smileUserParam
)
{
PageInfo
<
SmileUserVo
>
smileUserVos
=
iSmileUserService
.
userList
(
smileUserParam
);
return
AjaxResult
.
success
(
smileUserVos
);
TableDataInfo
rspData
=
new
TableDataInfo
();
rspData
.
setCode
(
0
);
rspData
.
setRows
(
smileUserVos
.
getList
());
rspData
.
setTotal
(
smileUserVos
.
getTotal
());
return
rspData
;
}
@PostMapping
(
"/getUserById"
)
...
...
@@ -75,9 +80,13 @@ public class SmileUserController extends BaseController {
@PostMapping
(
"/check/list"
)
@ApiOperation
(
"获取审核列表"
)
@ResponseBody
public
AjaxResult
list
(
UserCheckParam
userCheckParam
)
{
public
TableDataInfo
list
(
UserCheckParam
userCheckParam
)
{
PageInfo
<
SmileUserCheckDao
>
list
=
iSmileUserService
.
listUserCheck
(
userCheckParam
);
return
AjaxResult
.
success
(
list
);
TableDataInfo
rspData
=
new
TableDataInfo
();
rspData
.
setCode
(
0
);
rspData
.
setRows
(
list
.
getList
());
rspData
.
setTotal
(
list
.
getTotal
());
return
rspData
;
}
@PostMapping
(
"/check/updateById"
)
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/ShowAgentVo.java
0 → 100644
View file @
f266fad7
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
smile
.
dto
;
import
lombok.Data
;
import
java.math.BigDecimal
;
/**
* @author TT
*/
@Data
public
class
ShowAgentVo
{
private
Long
id
;
/**
* 演出id
*/
private
String
performanceId
;
/**
* 票id
*/
private
String
ticketId
;
/**
* 票种名称
*/
private
String
ticketName
;
/**
* 总代票提
*/
private
BigDecimal
totalCarry
;
/**
* 普代票提
*/
private
BigDecimal
ordCarry
;
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/ShowTicketVo.java
0 → 100644
View file @
f266fad7
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
smile
.
dto
;
import
java.math.BigDecimal
;
public
class
ShowTicketVo
{
/**
* 票种名
*/
private
String
ticketName
;
/**
* 单价
*/
private
BigDecimal
price
;
/**
* 类型 票类型 1单日票 2通票
*/
private
int
type
;
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/ShowVoById.java
0 → 100644
View file @
f266fad7
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
smile
.
dto
;
import
lombok.Data
;
import
java.util.List
;
/**
* @author TT
*/
@Data
public
class
ShowVoById
{
/**
* 演出id
*/
private
String
performancesId
;
/**
* 演出图片
*/
private
String
imgPoster
;
/**
* 演出名
*/
private
String
title
;
/**
* 演出开始时间
*/
private
String
timeStart
;
/**
* 演出结束时间
*/
private
String
timeEnd
;
/**
* 城市id
*/
private
Integer
cityId
;
/**
* 城市
*/
private
String
cityName
;
/**
* 场地id
*/
private
String
fieldId
;
/**
* 场地名称
*/
private
String
fieldName
;
/**
* 票提设置
*/
private
List
<
ShowAgentVo
>
showAgentVoList
;
/**
* 代理票种
*/
/**
* 演出详情
*/
private
String
details
;
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java
View file @
f266fad7
...
...
@@ -11,6 +11,8 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
import
com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService
;
import
com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils
;
import
com.liquidnet.service.goblin.constant.SmileRedisConst
;
import
com.liquidnet.service.goblin.dto.vo.SellDataVO
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo
;
import
com.liquidnet.service.kylin.entity.KylinOrderTickets
;
import
com.liquidnet.service.kylin.entity.KylinPerformances
;
import
com.liquidnet.service.kylin.mapper.KylinOrderTicketRelationsMapper
;
...
...
@@ -23,6 +25,8 @@ import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.mongodb.core.MongoTemplate
;
import
org.springframework.data.mongodb.core.query.Criteria
;
import
org.springframework.data.mongodb.core.query.Query
;
import
org.springframework.stereotype.Service
;
import
java.math.BigDecimal
;
...
...
@@ -82,14 +86,17 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
//根据演出id 查询所有订单
List
<
KylinOrderTickets
>
kylinOrderTicketsList
=
kylinOrderTicketsMapper
.
selectListByPerformanceId
(
kylinPerformances
.
getPerformancesId
());
Integer
open
=
0
;
int
open
=
0
;
BigDecimal
totalAmount
=
BigDecimal
.
valueOf
(
0
);
for
(
KylinOrderTickets
kylinOrderTickets
:
kylinOrderTicketsList
)
{
//演出张数
open
+=
(
kylinOrderTickets
.
getNumber
()
-
kylinOrderTickets
.
getRefundNumber
());
open
=
open
+
(
kylinOrderTickets
.
getNumber
()
-
kylinOrderTickets
.
getRefundNumber
());
//总销售金额
totalAmount
=
totalAmount
.
add
(
kylinOrderTickets
.
getPriceActual
()).
subtract
(
kylinOrderTickets
.
getPriceRefund
());
}
vo
.
setOpen
(
open
);
vo
.
setTotalAmount
(
totalAmount
);
//根据演出id查询销售代理
vo
.
setTotalOutAgent
(
kylinOrderTicketRelationsMapper
.
concatByAgentDed
(
kylinPerformances
.
getPerformancesId
()));
//演出结束时间
...
...
@@ -109,6 +116,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
List
<
String
>
collect
=
kylinPerformancesMapper
.
selectByComment
().
stream
().
map
(
KylinPerformances:
:
getPerformancesId
).
collect
(
Collectors
.
toList
());
String
perId
=
StringUtils
.
strip
(
collect
.
toString
(),
"[]"
);
smileRedisUtils
.
set
(
SmileRedisConst
.
SMILE_SHOW
,
perId
);
log
.
info
(
"redis show key:{}"
,
perId
);
return
AjaxResult
.
success
();
}
...
...
@@ -124,6 +132,26 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
@Override
public
AjaxResult
getShowById
(
String
performancesId
)
{
if
(
StringUtils
.
isEmpty
(
performancesId
)){
//根据演出ID查询演出数据演出数据
KylinPerformanceVo
kylinPerformanceVo
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"performancesId"
).
is
(
performancesId
)),
KylinPerformanceVo
.
class
,
KylinPerformanceVo
.
class
.
getSimpleName
());
//根据演出id查询代理用户
List
<
String
>
agentIds
=
kylinOrderTicketsMapper
.
getAgentIdListByPerId
(
performancesId
);
for
(
String
agentId
:
agentIds
)
{
SellDataVO
sellDataVO
=
(
SellDataVO
)
smileRedisUtils
.
get
(
SmileRedisConst
.
SELL_DATA
.
concat
(
agentId
).
concat
(
performancesId
));
}
}
return
null
;
}
...
...
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderTicketsMapper.java
View file @
f266fad7
...
...
@@ -52,4 +52,6 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
List
<
Map
>
getUserPerformance
(
@Param
(
"agentId"
)
String
userId
);
List
<
KylinOrderTickets
>
selectListByPerformanceId
(
@Param
(
"performancesId"
)
String
performancesId
);
List
<
String
>
getAgentIdListByPerId
(
@Param
(
"performancesId"
)
String
performancesId
);
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @
f266fad7
...
...
@@ -473,4 +473,13 @@
WHERE
kk.agent_id != 0 AND kk.performance_id = #{performancesId};
</select>
<select
id=
"getAgentIdListByPerId"
resultType=
"String"
>
SELECT agent_id
FROM kylin_order_ticket_relations
WHERE performance_id = #{performancesId}
AND agent_id != 0
GROUP BY
agent_id;
</select>
</mapper>
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