记得上下班打卡 | 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
22adcba2
Commit
22adcba2
authored
Mar 25, 2022
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
演出详情获取小家伙名字;payDetail null;partner/{performancesId} null;agentId default改为空
parent
cb4e2424
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
81 additions
and
6 deletions
+81
-6
pom.xml
liquidnet-bus-feign/liquidnet-api-feign-smile/pom.xml
+29
-0
FeignSmileApiClient.java
...iquidnet/service/feign/smile/api/FeignSmileApiClient.java
+20
-0
pom.xml
...uidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml
+5
-0
KylinMyPerformancesController.java
...rvice/kylin/controller/KylinMyPerformancesController.java
+1
-1
KylinPerformancesController.java
...service/kylin/controller/KylinPerformancesController.java
+2
-2
KylinPerformancesServiceImpl.java
...vice/kylin/service/impl/KylinPerformancesServiceImpl.java
+24
-3
No files found.
liquidnet-bus-feign/liquidnet-api-feign-smile/pom.xml
0 → 100644
View file @
22adcba2
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<parent>
<artifactId>
liquidnet-bus-feign
</artifactId>
<groupId>
com.liquidnet
</groupId>
<version>
1.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
liquidnet-api-feign-smile
</artifactId>
<properties>
<maven.compiler.source>
8
</maven.compiler.source>
<maven.compiler.target>
8
</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>
com.liquidnet
</groupId>
<artifactId>
liquidnet-service-smile-api
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<scope>
compile
</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
liquidnet-bus-feign/liquidnet-api-feign-smile/src/main/java/com/liquidnet/service/feign/smile/api/FeignSmileApiClient.java
0 → 100644
View file @
22adcba2
package
com
.
liquidnet
.
service
.
feign
.
smile
.
api
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.goblin.dto.vo.SmileUserVO
;
import
feign.hystrix.FallbackFactory
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
@Component
@FeignClient
(
name
=
"liquidnet-service-smile"
,
contextId
=
"FeignSmileApiClient"
,
path
=
"smile"
,
url
=
"${liquidnet.service.smile.url}"
,
fallback
=
FallbackFactory
.
Default
.
class
)
public
interface
FeignSmileApiClient
{
@PostMapping
(
"frontNoLogin/getUserByid"
)
ResponseDto
<
SmileUserVO
>
getUserByid
(
@RequestParam
(
"userId"
)
String
userId
);
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml
View file @
22adcba2
...
...
@@ -32,6 +32,11 @@
<artifactId>
liquidnet-api-feign-adam
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
com.liquidnet
</groupId>
<artifactId>
liquidnet-api-feign-smile
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</dependency>
</dependencies>
<build>
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinMyPerformancesController.java
View file @
22adcba2
...
...
@@ -48,7 +48,7 @@ public class KylinMyPerformancesController {
@RequestParam
(
"performancesId"
)
String
performancesId
)
{
try
{
KylinPerformanceVo
result
=
kylinPerformancesService
.
detail
(
performancesId
,
0
,
0
,
"
0
"
);
KylinPerformanceVo
result
=
kylinPerformancesService
.
detail
(
performancesId
,
0
,
0
,
""
);
if
(
result
!=
null
)
{
return
ResponseDto
.
success
(
result
);
}
else
{
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinPerformancesController.java
View file @
22adcba2
...
...
@@ -177,7 +177,7 @@ public class KylinPerformancesController {
@PathVariable
(
"performancesId"
)
String
performancesId
,
@RequestParam
(
defaultValue
=
"0"
)
double
latitudeFrom
,
@RequestParam
(
defaultValue
=
"0"
)
double
longitudeFrom
,
@RequestParam
(
defaultValue
=
"
0
"
)
String
agentId
@RequestParam
(
defaultValue
=
""
)
String
agentId
)
{
try
{
KylinPerformanceVo
result
=
kylinPerformancesService
.
detail
(
performancesId
,
latitudeFrom
,
longitudeFrom
,
agentId
);
...
...
@@ -217,7 +217,7 @@ public class KylinPerformancesController {
@RequestParam
(
defaultValue
=
"0"
)
Integer
isAgent
)
{
HashMap
<
String
,
Object
>
result
=
kylinPerformancesService
.
ticketTimesPartner
(
performancesId
,
isAgent
);
if
(
result
.
size
()
>
0
)
{
if
(
null
!=
result
&&
result
.
size
()
>
0
)
{
return
ResponseDto
.
success
(
result
);
}
else
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20702"
));
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @
22adcba2
...
...
@@ -6,6 +6,8 @@ import com.liquidnet.service.base.ResponseDto;
import
com.liquidnet.service.base.SqlMapping
;
import
com.liquidnet.service.base.UserPathDto
;
import
com.liquidnet.service.base.constant.MQConst
;
import
com.liquidnet.service.feign.smile.api.FeignSmileApiClient
;
import
com.liquidnet.service.goblin.dto.vo.SmileUserVO
;
import
com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum
;
import
com.liquidnet.service.kylin.constant.KylinTableStatusConst
;
import
com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo
;
...
...
@@ -57,6 +59,9 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
@Autowired
private
QueueUtils
queueUtils
;
@Autowired
private
FeignSmileApiClient
feignSmileApiClient
;
public
HashMap
<
String
,
Object
>
localList
(
int
days
,
String
cityName
,
Integer
adCode
,
int
type
,
Integer
isDiscount
,
Integer
isAdvance
,
Integer
isExclusive
,
...
...
@@ -190,10 +195,20 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
public
KylinPerformanceVo
detail
(
String
performancesId
,
double
latitudeFrom
,
double
longitudeFrom
,
String
agentId
)
{
KylinPerformanceVo
performancesInfo
=
dataUtils
.
getPerformanceVo
(
performancesId
);
if
(
null
==
performancesInfo
)
{
return
performancesInfo
;
return
null
;
}
String
agentName
=
dataUtils
.
getAgentInfoName
(
agentId
);
performancesInfo
.
setAgentName
(
agentName
);
if
(
StringUtil
.
isNotEmpty
(
agentId
))
{
try
{
ResponseDto
<
SmileUserVO
>
responseDto
=
feignSmileApiClient
.
getUserByid
(
agentId
);
String
agentName
=
responseDto
.
getData
().
getName
();
performancesInfo
.
setAgentName
(
agentName
);
}
catch
(
Exception
e
)
{
log
.
error
(
"演出详情 获取小家伙名称异常 eMsg:{}"
,
e
.
getMessage
());
performancesInfo
.
setAgentName
(
""
);
}
}
try
{
performancesInfo
=
checkAppStatusInfo
(
performancesInfo
);
performancesInfo
.
setMessage
(
KylinPerformanceStatusEnum
.
getName
(
performancesInfo
.
getAppStatus
()));
...
...
@@ -223,6 +238,9 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
public
HashMap
<
String
,
Object
>
ticketTimesPartner
(
String
performancesId
,
Integer
isAgent
)
{
KylinPerformanceVo
vo
=
dataUtils
.
getPerformanceVo
(
performancesId
);
if
(
null
==
vo
)
{
return
null
;
}
vo
=
checkAppStatusInfo
(
vo
);
queueUtils
.
pushPvUv
(
CurrentUtil
.
getCurrentUid
(),
KylinTableStatusConst
.
PvUv
.
TK_TICKET
.
getKey
(),
performancesId
,
null
,
null
,
CurrentUtil
.
getCliIpAddr
());
List
<
KylinTicketTimesVo
>
ticketTimesList
=
vo
.
getTicketTimeList
();
...
...
@@ -392,6 +410,9 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
public
PayDetailVo
payDetail
(
String
performancesId
,
String
ticketsId
)
{
KylinTicketVo
ticketVo
=
null
;
KylinPerformanceVo
performancesInfo
=
dataUtils
.
getPerformanceVo
(
performancesId
);
if
(
null
==
performancesInfo
)
{
return
null
;
}
performancesInfo
=
checkAppStatusInfo
(
performancesInfo
);
queueUtils
.
pushPvUv
(
CurrentUtil
.
getCurrentUid
(),
KylinTableStatusConst
.
PvUv
.
TK_ORDER
.
getKey
(),
performancesId
,
null
,
null
,
CurrentUtil
.
getCliIpAddr
());
for
(
int
i
=
0
;
i
<
performancesInfo
.
getTicketTimeList
().
size
();
i
++)
{
...
...
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