记得上下班打卡 | git大法好,push需谨慎

Commit 22adcba2 authored by jiangxiulong's avatar jiangxiulong

演出详情获取小家伙名字;payDetail null;partner/{performancesId} null;agentId default改为空

parent cb4e2424
<?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
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);
}
......@@ -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>
......
......@@ -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 {
......
......@@ -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"));
......
......@@ -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++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment