Merge branch 'dev' into test

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -232,6 +232,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
                         new Document("$set", new Document("expiryAt", expiryAt).append("state", 1))
                 );
                 log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
+                existUserMemberVo.setState(1);
                 existUserMemberVo.setExpiryAt(expiryAt);
                 s = System.currentTimeMillis();
                 adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), existUserMemberVo);

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

@@ -293,12 +293,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 }
 
                 //限购判断 如果实名 则身份证维度限购 如果不实名则数量限购
-                Query queryPerformance = new Query();
-                Query queryTicket = new Query();
-                queryPerformance.addCriteria(Criteria.where("performanceId").is(payOrderParam.getPerformanceId()).and("status").in(KylinTableStatusConst.ORDER_STATUS0, KylinTableStatusConst.ORDER_STATUS1));
-                queryTicket.addCriteria(Criteria.where("ticketId").is(payOrderParam.getTicketId()).and("status").in(KylinTableStatusConst.ORDER_STATUS0, KylinTableStatusConst.ORDER_STATUS1));
-
-
                 if (entersVoList.size() > 0) {
                     currentTime = System.currentTimeMillis();
                     for (int i = 0; i < entersVoList.size(); i++) {