Merge branch 'pre' into 'master'

Pre

See merge request !313

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

@@ -173,49 +173,9 @@ public class TempServiceImpl implements IKylinTempService {
         List<KylinOrderTicketEntitiesVo> dataList = mongoTemplate.find(Query.query(Criteria.where("performanceId").is(performance_id).and("ticketId").in(ticket_ids).and("enterIdCode").is(idcode))
                 , KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
         for (KylinOrderTicketEntitiesVo entitiesVo : dataList) {
-            String ticketType = dataUtils.getOrderTicketVo(entitiesVo.getOrderId()).getGetTicketType();
-            if (entitiesVo.getEnterIdCode().equals(idcode) && entitiesVo.getIsPayment() == 1 && !"express".equals(ticketType)) {
-                CheckData vo = CheckData.getNew();
-                vo.setCheck_status(entitiesVo.getStatus());
-                vo.setCheck_time(entitiesVo.getCheckedAt());
-                vo.setEnter_idcode(entitiesVo.getEnterIdCode());
-                vo.setEnter_mobile(entitiesVo.getEnterMobile());
-                vo.setEnter_name(entitiesVo.getEnterName());
-                vo.setTicket_id(entitiesVo.getTicketId());
-                vo.setTicket_name(entitiesVo.getTicketTitle());
-                vo.setTicket_count(1);
-                vo.setTicket_entity_id(entitiesVo.getOrderTicketEntitiesId());
-                vo.setTicket_use_end(entitiesVo.getUseEnd());
-                vo.setTicket_use_start(entitiesVo.getUseStart());
-                vo.setTicket_type(vo.getTicket_use_end().equals(vo.getTicket_use_start()) ? 1 : 2);
-                vo.setSelect_status(false);
-
-                KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(performance_id);
-                for (int x = 0; x < performanceData.getTicketTimeList().size(); x++) {
-                    KylinTicketTimesVo timeItem = performanceData.getTicketTimeList().get(x);
-                    for (int y = 0; y < timeItem.getTicketList().size(); y++) {
-                        KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
-                        if (ticketItem.getTicketsId().equals(entitiesVo.getTicketId())) {
-                            vo.setTicket_price(ticketItem.getPrice().toString());
-                            break;
-                        }
-                    }
-                }
-                voList.add(vo);
-            }
-        }
-        return ResponseDto.success(voList);
-    }
-
-    @Override
-    public ResponseDto<List<CheckData>> checkTicket(String performance_id, String idcode, String remarks, String[] ticket_ids, String check_time) {
-        List<CheckData> voList = ObjectUtil.checkDataArrayList();
-        try {
-            List<KylinOrderTicketEntitiesVo> dataList = mongoTemplate.find(Query.query(Criteria.where("performanceId").is(performance_id).and("ticketId").in(ticket_ids).and("enterIdCode").is(idcode))
-                    , KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
-            for (KylinOrderTicketEntitiesVo entitiesVo : dataList) {
+            if (entitiesVo.getEnterIdCode().equals(idcode) && entitiesVo.getIsPayment() == 1 ) {
                 String ticketType = dataUtils.getOrderTicketVo(entitiesVo.getOrderId()).getGetTicketType();
-                if (entitiesVo.getEnterIdCode().equals(idcode) && entitiesVo.getIsPayment() == 1 && !"express".equals(ticketType)) {
+                if( !"express".equals(ticketType)){
                     CheckData vo = CheckData.getNew();
                     vo.setCheck_status(entitiesVo.getStatus());
                     vo.setCheck_time(entitiesVo.getCheckedAt());
@@ -225,11 +185,10 @@ public class TempServiceImpl implements IKylinTempService {
                     vo.setTicket_id(entitiesVo.getTicketId());
                     vo.setTicket_name(entitiesVo.getTicketTitle());
                     vo.setTicket_count(1);
-                    vo.setTicket_entity_id("");
+                    vo.setTicket_entity_id(entitiesVo.getOrderTicketEntitiesId());
                     vo.setTicket_use_end(entitiesVo.getUseEnd());
                     vo.setTicket_use_start(entitiesVo.getUseStart());
-                    vo.setTicket_type(vo.getTicket_use_end().equalsIgnoreCase(vo.getTicket_use_start()) ? 1 : 2);
-                    vo.setTicket_entity_id(entitiesVo.getOrderTicketEntitiesId());
+                    vo.setTicket_type(vo.getTicket_use_end().equals(vo.getTicket_use_start()) ? 1 : 2);
                     vo.setSelect_status(false);
 
                     KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(performance_id);
@@ -246,6 +205,51 @@ public class TempServiceImpl implements IKylinTempService {
                     voList.add(vo);
                 }
             }
+        }
+        return ResponseDto.success(voList);
+    }
+
+    @Override
+    public ResponseDto<List<CheckData>> checkTicket(String performance_id, String idcode, String remarks, String[] ticket_ids, String check_time) {
+        List<CheckData> voList = ObjectUtil.checkDataArrayList();
+        try {
+            List<KylinOrderTicketEntitiesVo> dataList = mongoTemplate.find(Query.query(Criteria.where("performanceId").is(performance_id).and("ticketId").in(ticket_ids).and("enterIdCode").is(idcode))
+                    , KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
+            for (KylinOrderTicketEntitiesVo entitiesVo : dataList) {
+                if (entitiesVo.getEnterIdCode().equals(idcode) && entitiesVo.getIsPayment() == 1) {
+                    String ticketType = dataUtils.getOrderTicketVo(entitiesVo.getOrderId()).getGetTicketType();
+                    if(!"express".equals(ticketType)){
+                        CheckData vo = CheckData.getNew();
+                        vo.setCheck_status(entitiesVo.getStatus());
+                        vo.setCheck_time(entitiesVo.getCheckedAt());
+                        vo.setEnter_idcode(entitiesVo.getEnterIdCode());
+                        vo.setEnter_mobile(entitiesVo.getEnterMobile());
+                        vo.setEnter_name(entitiesVo.getEnterName());
+                        vo.setTicket_id(entitiesVo.getTicketId());
+                        vo.setTicket_name(entitiesVo.getTicketTitle());
+                        vo.setTicket_count(1);
+                        vo.setTicket_entity_id("");
+                        vo.setTicket_use_end(entitiesVo.getUseEnd());
+                        vo.setTicket_use_start(entitiesVo.getUseStart());
+                        vo.setTicket_type(vo.getTicket_use_end().equalsIgnoreCase(vo.getTicket_use_start()) ? 1 : 2);
+                        vo.setTicket_entity_id(entitiesVo.getOrderTicketEntitiesId());
+                        vo.setSelect_status(false);
+
+                        KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(performance_id);
+                        for (int x = 0; x < performanceData.getTicketTimeList().size(); x++) {
+                            KylinTicketTimesVo timeItem = performanceData.getTicketTimeList().get(x);
+                            for (int y = 0; y < timeItem.getTicketList().size(); y++) {
+                                KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
+                                if (ticketItem.getTicketsId().equals(entitiesVo.getTicketId())) {
+                                    vo.setTicket_price(ticketItem.getPrice().toString());
+                                    break;
+                                }
+                            }
+                        }
+                        voList.add(vo);
+                    }
+                    }
+            }
 
             List<WriteModel<Document>> list = ObjectUtil.getWriteModelDocumentArrayList();
             LinkedList<Object[]> paramsList = CollectionUtil.linkedListObjectArr();