记得上下班打卡 | 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
b4fed0c7
Commit
b4fed0c7
authored
Jun 25, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
分销name
parent
4d5b7983
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
6 deletions
+24
-6
KylinPerformanceVo.java
...uidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
+3
-0
KylinPerformancesController.java
...service/kylin/controller/KylinPerformancesController.java
+5
-3
KylinPerformancesServiceImpl.java
...vice/kylin/service/impl/KylinPerformancesServiceImpl.java
+3
-1
DataUtils.java
...ain/java/com/liquidnet/service/kylin/utils/DataUtils.java
+13
-2
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
View file @
b4fed0c7
...
@@ -104,6 +104,9 @@ public class KylinPerformanceVo {
...
@@ -104,6 +104,9 @@ public class KylinPerformanceVo {
@ApiModelProperty
(
value
=
"场次"
)
@ApiModelProperty
(
value
=
"场次"
)
private
List
<
KylinTicketTimesVo
>
ticketTimeList
;
private
List
<
KylinTicketTimesVo
>
ticketTimeList
;
@ApiModelProperty
(
value
=
"分销人名称"
)
private
String
agentName
;
public
void
setPerformance
(
KylinPerformances
performance
)
{
public
void
setPerformance
(
KylinPerformances
performance
)
{
this
.
mid
=
performance
.
getMid
();
this
.
mid
=
performance
.
getMid
();
this
.
performancesId
=
performance
.
getPerformancesId
();
this
.
performancesId
=
performance
.
getPerformancesId
();
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinPerformancesController.java
View file @
b4fed0c7
...
@@ -144,14 +144,16 @@ public class KylinPerformancesController {
...
@@ -144,14 +144,16 @@ public class KylinPerformancesController {
@ApiImplicitParams
({
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"path"
,
dataType
=
"String"
,
name
=
"performancesId"
,
value
=
"演出id"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"path"
,
dataType
=
"String"
,
name
=
"performancesId"
,
value
=
"演出id"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"double"
,
name
=
"latitudeFrom"
,
value
=
"经纬度"
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"double"
,
name
=
"latitudeFrom"
,
value
=
"经纬度"
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"double"
,
name
=
"longitudeFrom"
,
value
=
"经纬度"
)
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"double"
,
name
=
"longitudeFrom"
,
value
=
"经纬度"
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"agentId"
,
value
=
"分销用户id"
)
})
})
public
ResponseDto
<
KylinPerformanceVo
>
detail
(
public
ResponseDto
<
KylinPerformanceVo
>
detail
(
@PathVariable
(
"performancesId"
)
String
performancesId
,
@PathVariable
(
"performancesId"
)
String
performancesId
,
@RequestParam
(
defaultValue
=
"0"
)
double
latitudeFrom
,
@RequestParam
(
defaultValue
=
"0"
)
double
latitudeFrom
,
@RequestParam
(
defaultValue
=
"0"
)
double
longitudeFrom
@RequestParam
(
defaultValue
=
"0"
)
double
longitudeFrom
,
@RequestParam
(
defaultValue
=
"0"
)
String
agentId
)
{
)
{
KylinPerformanceVo
result
=
kylinPerformancesService
.
detail
(
performancesId
,
latitudeFrom
,
longitudeFrom
);
KylinPerformanceVo
result
=
kylinPerformancesService
.
detail
(
performancesId
,
latitudeFrom
,
longitudeFrom
,
agentId
);
if
(
result
!=
null
)
{
if
(
result
!=
null
)
{
return
ResponseDto
.
success
(
result
);
return
ResponseDto
.
success
(
result
);
}
else
{
}
else
{
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @
b4fed0c7
...
@@ -164,8 +164,10 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
...
@@ -164,8 +164,10 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
return
performancesListExclusive
;
return
performancesListExclusive
;
}
}
public
KylinPerformanceVo
detail
(
String
performancesId
,
double
latitudeFrom
,
double
longitudeFrom
)
{
public
KylinPerformanceVo
detail
(
String
performancesId
,
double
latitudeFrom
,
double
longitudeFrom
,
String
agentId
)
{
KylinPerformanceVo
performancesInfo
=
dataUtils
.
getPerformanceVo
(
performancesId
);
KylinPerformanceVo
performancesInfo
=
dataUtils
.
getPerformanceVo
(
performancesId
);
String
agentName
=
dataUtils
.
getAgentInfoName
(
agentId
);
performancesInfo
.
setAgentName
(
agentName
);
try
{
try
{
performancesInfo
=
checkAppStatusInfo
(
performancesInfo
);
performancesInfo
=
checkAppStatusInfo
(
performancesInfo
);
performancesInfo
.
setMessage
(
KylinPerformanceStatusEnum
.
getName
(
performancesInfo
.
getAppStatus
()));
performancesInfo
.
setMessage
(
KylinPerformanceStatusEnum
.
getName
(
performancesInfo
.
getAppStatus
()));
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
View file @
b4fed0c7
...
@@ -5,7 +5,6 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
...
@@ -5,7 +5,6 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.service.kylin.constant.KylinRedisConst
;
import
com.liquidnet.service.kylin.constant.KylinRedisConst
;
import
com.liquidnet.service.kylin.dto.vo.*
;
import
com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo
;
import
com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo
;
import
com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo
;
import
com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.*
;
import
com.liquidnet.service.kylin.dto.vo.mongo.*
;
...
@@ -24,7 +23,6 @@ import org.springframework.stereotype.Component;
...
@@ -24,7 +23,6 @@ import org.springframework.stereotype.Component;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.time.format.DateTimeFormatter
;
import
java.util.*
;
import
java.util.*
;
import
java.util.regex.Pattern
;
import
java.util.regex.Pattern
;
...
@@ -451,6 +449,19 @@ public class DataUtils {
...
@@ -451,6 +449,19 @@ public class DataUtils {
return
(
KylinPerformanceVo
)
redisUtil
.
get
(
KylinRedisConst
.
PERFORMANCES
+
performanceId
);
return
(
KylinPerformanceVo
)
redisUtil
.
get
(
KylinRedisConst
.
PERFORMANCES
+
performanceId
);
}
}
/**
* 获取分销用户名字
*
* @param agentId
* @return
*/
public
String
getAgentInfoName
(
String
agentId
)
{
String
redisKey
=
KylinRedisConst
.
PERFORMANCES_AGENT_INFO
.
concat
(
agentId
);
// String name = (String) redisUtil.hget(redisKey, "name");
String
name
=
""
;
return
name
;
}
/**
/**
* 获取演出列表redis
* 获取演出列表redis
*
*
...
...
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