记得上下班打卡 | 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
46bf3567
Commit
46bf3567
authored
Sep 20, 2022
by
GaoHu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
特邀代理详情返回
parent
10b5dc21
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
78 additions
and
17 deletions
+78
-17
SmileUserVo.java
...iquidnet/client/admin/zhengzai/smile/dto/SmileUserVo.java
+56
-3
ISmileUserService.java
...lient/admin/zhengzai/smile/service/ISmileUserService.java
+0
-1
SmileShowServiceImpl.java
...min/zhengzai/smile/service/impl/SmileShowServiceImpl.java
+0
-10
SmileUserServiceImpl.java
...min/zhengzai/smile/service/impl/SmileUserServiceImpl.java
+22
-3
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileUserVo.java
View file @
46bf3567
...
...
@@ -5,11 +5,12 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.*
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
@Data
public
class
SmileUserVo
implements
Serializable
,
Cloneable
{
public
class
SmileUserVo
implements
Serializable
,
Cloneable
{
private
Long
id
;
...
...
@@ -19,7 +20,7 @@ public class SmileUserVo implements Serializable, Cloneable{
/**
* 照片
*/
@ApiModelProperty
(
"照片
d
"
)
@ApiModelProperty
(
"照片"
)
private
String
img
;
/**
...
...
@@ -183,10 +184,19 @@ public class SmileUserVo implements Serializable, Cloneable{
*/
@ApiModelProperty
(
"擅长3"
)
private
String
specialty3
;
@ApiModelProperty
(
"创建时间"
)
private
LocalDateTime
createdDate
;
@ApiModelProperty
(
"票提"
)
private
BigDecimal
ticket
;
@ApiModelProperty
(
"代理演出名称"
)
private
String
title
;
@ApiModelProperty
(
"代理描述"
)
private
String
describe
;
private
static
final
SmileUserVo
obj
=
new
SmileUserVo
();
public
static
SmileUserVo
getNew
()
{
...
...
@@ -198,4 +208,47 @@ public class SmileUserVo implements Serializable, Cloneable{
return
new
SmileUserVo
();
}
public
SmileUserVo
copy
(
SmileUser
smileUser
)
{
if
(
null
==
smileUser
)
return
this
;
this
.
setId
(
smileUser
.
getId
());
this
.
setImg
(
smileUser
.
getImg
());
this
.
setBirthday
(
smileUser
.
getBirthday
());
this
.
setAgent
(
smileUser
.
getAgent
());
this
.
setArea
(
smileUser
.
getArea
());
this
.
setAreaId
(
smileUser
.
getAreaId
());
this
.
setAddress
(
smileUser
.
getAddress
());
this
.
setCity
(
smileUser
.
getCity
());
this
.
setCityId
(
smileUser
.
getCityId
());
this
.
setCreatedDate
(
smileUser
.
getCreatedDate
());
this
.
setErrorReason
(
smileUser
.
getErrorReason
());
this
.
setName
(
smileUser
.
getName
());
this
.
setIdentity
(
smileUser
.
getIdentity
());
this
.
setIntroduce
(
smileUser
.
getIntroduce
());
this
.
setPhone
(
smileUser
.
getPhone
());
this
.
setOrgId
(
smileUser
.
getOrgId
());
this
.
setSchoolId
(
smileUser
.
getSchoolId
());
this
.
setSchoolMajor
(
smileUser
.
getSchoolMajor
());
this
.
setSchoolName
(
smileUser
.
getSchoolName
());
this
.
setSex
(
smileUser
.
getSex
());
this
.
setIdCard
(
smileUser
.
getIdCard
());
this
.
setProvince
(
smileUser
.
getProvince
());
this
.
setProvinceId
(
smileUser
.
getProvinceId
());
this
.
setSpecialty1
(
smileUser
.
getSpecialty1
());
this
.
setSpecialty2
(
smileUser
.
getSpecialty2
());
this
.
setSpecialty3
(
smileUser
.
getSpecialty3
());
this
.
setWechat
(
smileUser
.
getWechat
());
this
.
setType
(
smileUser
.
getType
());
this
.
setTag
(
smileUser
.
getTag
());
return
this
;
}
public
SmileUserVo
copyInvited
(
SmileUser
smileUser
)
{
if
(
null
==
smileUser
)
return
this
;
this
.
setId
(
smileUser
.
getId
());
this
.
setUid
(
smileUser
.
getUid
());
this
.
setPhone
(
smileUser
.
getPhone
());
this
.
setDescribe
(
smileUser
.
getIntroduce
());
this
.
setType
(
smileUser
.
getType
());
return
this
;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileUserService.java
View file @
46bf3567
...
...
@@ -4,7 +4,6 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.github.pagehelper.PageInfo
;
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.service.smile.entity.SmileUser
;
import
com.liquidnet.service.smile.entity.dao.SmileUserCheckDao
;
...
...
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 @
46bf3567
...
...
@@ -37,22 +37,15 @@ import com.liquidnet.service.smile.mapper.SmilePriceMapper;
import
com.liquidnet.service.smile.mapper.SmileSchoolMapper
;
import
com.liquidnet.service.smile.mapper.SmileUserMapper
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.BeanUtils
;
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.http.HttpHeaders
;
import
org.springframework.http.MediaType
;
import
org.springframework.stereotype.Service
;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.math.BigDecimal
;
import
java.math.BigInteger
;
import
java.math.RoundingMode
;
import
java.nio.charset.StandardCharsets
;
import
java.time.LocalDateTime
;
import
java.time.format.DateTimeFormatter
;
import
java.util.*
;
...
...
@@ -101,9 +94,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
@Autowired
KylinPerformanceStatusMapper
kylinPerformanceStatusMapper
;
@Autowired
private
KylinOrderTicketsMapper
orderTicketsMapper
;
@Override
public
TableDataInfo
listShow
(
SmileShowParam
smileShowParam
)
{
PageHelper
.
startPage
(
smileShowParam
.
getPageNum
(),
smileShowParam
.
getPageSize
());
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java
View file @
46bf3567
...
...
@@ -13,6 +13,8 @@ import com.liquidnet.commons.lang.util.BeanUtil;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.service.goblin.dto.vo.SmileAgentVo
;
import
com.liquidnet.service.goblin.dto.vo.SmileUserVO
;
import
com.liquidnet.service.kylin.entity.KylinPerformances
;
import
com.liquidnet.service.kylin.mapper.KylinPerformancesMapper
;
import
com.liquidnet.service.smile.entity.SmileAgent
;
import
com.liquidnet.service.smile.entity.SmileOrganization
;
import
com.liquidnet.service.smile.entity.SmileSchool
;
...
...
@@ -53,6 +55,9 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
@Autowired
SmileAgentMapper
smileAgentMapper
;
@Autowired
KylinPerformancesMapper
kylinPerformancesMapper
;
@Override
public
List
<
SmileUser
>
userList
(
SmileUserParam
smileUserParam
)
{
try
{
...
...
@@ -89,9 +94,23 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
queryWrapper
.
eq
(
SmileUser:
:
getDelTag
,
0
);
queryWrapper
.
eq
(
SmileUser:
:
getUid
,
uid
);
SmileUser
smileUser
=
smileUserMapper
.
selectOne
(
queryWrapper
);
SmileUserVo
smileUserVo
=
new
SmileUserVo
();
BeanUtils
.
copyProperties
(
smileUser
,
smileUserVo
);
log
.
debug
(
"smileUser:{}"
,
smileUser
);
//判断是否为特邀代理
SmileUserVo
smileUserVo
=
null
;
if
(
smileUser
.
getType
()
==
5
)
{
smileUserVo
=
new
SmileUserVo
().
copyInvited
(
smileUser
);
LambdaQueryWrapper
<
SmileAgent
>
agentLambdaQueryWrapper
=
new
LambdaQueryWrapper
<>();
agentLambdaQueryWrapper
.
eq
(
SmileAgent:
:
getTicketId
,
smileUserVo
.
getUid
());
agentLambdaQueryWrapper
.
eq
(
SmileAgent:
:
getDelTag
,
0
);
SmileAgent
smileAgent
=
smileAgentMapper
.
selectOne
(
agentLambdaQueryWrapper
);
smileUserVo
.
setTicket
(
smileAgent
.
getTotalCarry
().
multiply
(
new
BigDecimal
(
"100"
)));
//获取演出名
KylinPerformances
kylinPerformances
=
kylinPerformancesMapper
.
selectOne
(
Wrappers
.
lambdaQuery
(
KylinPerformances
.
getNew
())
.
eq
(
KylinPerformances:
:
getPerformancesId
,
smileAgent
.
getPerformanceId
())
.
select
(
KylinPerformances:
:
getTitle
));
smileUserVo
.
setTitle
(
kylinPerformances
.
getTitle
());
}
else
{
smileUserVo
=
new
SmileUserVo
().
copy
(
smileUser
);
}
return
smileUserVo
;
}
...
...
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