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

Commit 63d451a8 authored by jiangxiulong's avatar jiangxiulong

agent

parent 0d1d26af
...@@ -188,7 +188,6 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService { ...@@ -188,7 +188,6 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
} }
public HashMap<String, Object> ticketTimesPartner(String performancesId, Integer isAgent) { public HashMap<String, Object> ticketTimesPartner(String performancesId, Integer isAgent) {
log.info("000"+isAgent.toString());
KylinPerformanceVo vo = dataUtils.getPerformanceVo(performancesId); KylinPerformanceVo vo = dataUtils.getPerformanceVo(performancesId);
vo = checkAppStatusInfo(vo); vo = checkAppStatusInfo(vo);
...@@ -197,24 +196,18 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService { ...@@ -197,24 +196,18 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
for (KylinTicketTimesVo partner : ticketTimesList) { for (KylinTicketTimesVo partner : ticketTimesList) {
List<KylinTicketVo> ticketList = partner.getTicketList(); List<KylinTicketVo> ticketList = partner.getTicketList();
List<KylinTicketVo> ticketListNew = ObjectUtil.getKylinTicketVoArrayList(); List<KylinTicketVo> ticketListNew = ObjectUtil.getKylinTicketVoArrayList();
log.info("for");
for (KylinTicketVo ticket : ticketList) { for (KylinTicketVo ticket : ticketList) {
log.info("getTicketsId" + ticket.getTicketsId());
int status = checkTicketStatus(ticket); int status = checkTicketStatus(ticket);
ticket.setStatus(status); ticket.setStatus(status);
// 会员状态 // 会员状态
Integer isMemberStatus = getIsMemberStatus(ticket); Integer isMemberStatus = getIsMemberStatus(ticket);
ticket.setIsMemberStatus(isMemberStatus); ticket.setIsMemberStatus(isMemberStatus);
if (null == isAgent || 0 == isAgent) { if (null == isAgent || 0 == isAgent) {
log.info("1111");
if (0 == ticket.getIsAgent()) { if (0 == ticket.getIsAgent()) {
log.info("2222");
ticketListNew.add(ticket); ticketListNew.add(ticket);
} }
} else if (1 == isAgent) { } else if (1 == isAgent) {
log.info("3333");
if (1 == ticket.getIsAgent()) { if (1 == ticket.getIsAgent()) {
log.info("4444");
ticketListNew.add(ticket); ticketListNew.add(ticket);
} }
} }
......
...@@ -20,7 +20,6 @@ import org.springframework.data.mongodb.core.query.Query; ...@@ -20,7 +20,6 @@ import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import java.util.regex.Pattern; import java.util.regex.Pattern;
...@@ -207,8 +206,8 @@ public class DataUtils { ...@@ -207,8 +206,8 @@ public class DataUtils {
*/ */
public String getAgentInfoName(String agentId) { public String getAgentInfoName(String agentId) {
String redisKey = KylinRedisConst.PERFORMANCES_AGENT_INFO.concat(agentId); String redisKey = KylinRedisConst.PERFORMANCES_AGENT_INFO.concat(agentId);
// String name = (String) redisUtil.hget(redisKey, "name"); String name = (String) redisUtil.hget(redisKey, "name");
String name = ""; // String name = "";
return name; return name;
} }
......
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