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

Commit b4fed0c7 authored by jiangxiulong's avatar jiangxiulong

分销name

parent 4d5b7983
......@@ -104,6 +104,9 @@ public class KylinPerformanceVo {
@ApiModelProperty(value = "场次")
private List<KylinTicketTimesVo> ticketTimeList;
@ApiModelProperty(value = "分销人名称")
private String agentName;
public void setPerformance(KylinPerformances performance) {
this.mid = performance.getMid();
this.performancesId = performance.getPerformancesId();
......
......@@ -144,14 +144,16 @@ public class KylinPerformancesController {
@ApiImplicitParams({
@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 = "longitudeFrom", value = "经纬度")
@ApiImplicitParam(type = "query", dataType = "double", name = "longitudeFrom", value = "经纬度"),
@ApiImplicitParam(type = "query", dataType = "String", name = "agentId", value = "分销用户id")
})
public ResponseDto<KylinPerformanceVo> detail(
@PathVariable("performancesId") String performancesId,
@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) {
return ResponseDto.success(result);
} else {
......
......@@ -164,8 +164,10 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
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);
String agentName = dataUtils.getAgentInfoName(agentId);
performancesInfo.setAgentName(agentName);
try {
performancesInfo = checkAppStatusInfo(performancesInfo);
performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
......
......@@ -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.JsonUtils;
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.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.*;
......@@ -24,7 +23,6 @@ import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.regex.Pattern;
......@@ -451,6 +449,19 @@ public class DataUtils {
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
*
......
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