Merge branch 'pre' into 'master'

Pre

See merge request !31

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -193,7 +193,9 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
 
         List<KylinTicketTimesVo> ticketTimesList = vo.getTicketTimeList();
         if (null != ticketTimesList) {
-            for (KylinTicketTimesVo partner : ticketTimesList) {
+
+            for (int i = 0; i < ticketTimesList.size(); i++) {
+                KylinTicketTimesVo partner = ticketTimesList.get(i);
                 List<KylinTicketVo> ticketList = partner.getTicketList();
                 List<KylinTicketVo> ticketListNew = ObjectUtil.getKylinTicketVoArrayList();
                 for (KylinTicketVo ticket : ticketList) {
@@ -203,16 +205,17 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
                     Integer isMemberStatus = getIsMemberStatus(ticket);
                     ticket.setIsMemberStatus(isMemberStatus);
                     if (null == isAgent || 0 == isAgent) {
-                        if (0 == ticket.getIsAgent()) {
-                            ticketListNew.add(ticket);
-                        }
-                    } else if (1 == isAgent) {
+                        ticketListNew.add(ticket);
+                    } else if (1 >= isAgent) {
                         if (1 == ticket.getIsAgent()) {
                             ticketListNew.add(ticket);
                         }
                     }
                 }
                 partner.setTicketList(ticketListNew);
+                if (ticketListNew.size() == 0) {
+                    ticketTimesList.remove(i);
+                }
             }
         }
 

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -907,12 +907,22 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
     }
 
     public boolean checkAgent(String agentId, KylinTicketVo ticketData) {
-        boolean isAgent = ticketData.getIsAgent() == 1;
-        if (isAgent) {
-            return redisUtil.getDB15RedisHasKey(KylinRedisConst.AGENT, agentId);
-        } else {
+        if(agentId.equals(0)){
             return true;
+        }else{
+            boolean isAgent = ticketData.getIsAgent() == 1;
+            if (isAgent) {
+                return true;
+            } else {
+                return !redisUtil.getDB15RedisHasKey(KylinRedisConst.AGENT, agentId);
+            }
         }
+//        boolean isAgent = ticketData.getIsAgent() == 1;
+//        if (isAgent) {
+//            return redisUtil.getDB15RedisHasKey(KylinRedisConst.AGENT, agentId);
+//        } else {
+//            return true;
+//        }
     }
 
     private boolean sycDamaiOrder(String orderId, int isMember) {