修改转赠bug

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderTicketsAdminServiceImpl.java

@@ -182,6 +182,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
             }
             return vo;
         } catch (Exception e) {
+            e.printStackTrace();
             return vo;
         }
     }

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

@@ -831,7 +831,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             enterSize = enterIdList.split(",").length;
         }
         KylinOrderTicketVo orderTicketVo = dataUtils.getTransferOrder(uid);
-        if(orderTicketVo==null){
+        if (orderTicketVo == null) {
             return ResponseDto.failure("无订单");
         }
         if (!orderTicketVo.getTransferStatus().equals(4)) {
@@ -881,6 +881,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 }
                 for (AdamEntersVo item : adamEnters) {
                     entersVoList.add(item);
+                    if(!item.getType().equals(1)){
+                        return ResponseDto.failure("学生票优惠核验失败，无法购买");
+                    }
                     if (ticketData.getIsStudent() == 1) {
                         int age = IDCard.getAgeByIdCard(item.getIdCard());
                         if (age > 25) {
@@ -925,7 +928,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")), ""));
             orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
             orderTickets.setPerformanceTitle(orderTicketVo.getPerformanceTitle());
-            orderTickets.setOrderCode(orderTicketVo.getOrderCode());
+            orderTickets.setOrderCode(IDGenerator.ticketOrderCode(orderTicketId));
             orderTickets.setPayCode(orderTicketVo.getPayCode());
             orderTickets.setQrCode(orderTicketVo.getQrCode());
             orderTickets.setOrderType(source);
@@ -984,7 +987,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             orderTicketRelations.setIsMember(orderTicketVo.getIsMember());
             orderTicketRelations.setPerformanceId(performanceData.getPerformancesId());
             orderTicketRelations.setTimeId(ticketTimesData.getTimeId());
-            orderTicketRelations.setTicketId(ticketData.getTimeId());
+            orderTicketRelations.setTicketId(ticketData.getTicketsId());
             orderTicketRelations.setCreatedAt(now);
             orderTicketRelations.setUpdatedAt(null);
             sqls.add(SqlMapping.get("kylin_order_ticket_relation.add"));
@@ -995,7 +998,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             KylinOrderTicketEntities orderTicketEntities = KylinOrderTicketEntities.getNew();
             LinkedList<Object[]> sqlsDataD = CollectionUtil.linkedListObjectArr();
             sqls.add(SqlMapping.get("kylin_order_ticket_entities.add"));
-            for (KylinOrderTicketEntitiesVo entitiesVo : orderTicketVo.getEntitiesVoList()) {
+            for (int i = 0; i < orderTicketVo.getEntitiesVoList().size(); i++) {
+                KylinOrderTicketEntitiesVo entitiesVo = orderTicketVo.getEntitiesVoList().get(i);
                 String orderTicketEntitiesId = entitiesVo.getOrderTicketEntitiesId();
                 orderTicketEntities.setOrderTicketEntitiesId(orderTicketEntitiesId);
                 orderTicketEntities.setOrderId(orderTicketId);
@@ -1004,9 +1008,17 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 orderTicketEntities.setPerformanceId(performanceData.getPerformancesId());
                 orderTicketEntities.setTimeId(ticketTimesData.getTicketTimesId());
                 orderTicketEntities.setEnterType(entitiesVo.getEnterType());
-                orderTicketEntities.setEnterName(entitiesVo.getEnterName());
-                orderTicketEntities.setEnterMobile(entitiesVo.getEnterMobile());
-                orderTicketEntities.setEnterIdCode(entitiesVo.getEnterIdCode());
+
+                if (entersVoList.size() > 0) {
+                    orderTicketEntities.setEnterName(entersVoList.get(i).getName());
+                    orderTicketEntities.setEnterMobile(entersVoList.get(i).getMobile());
+                    orderTicketEntities.setEnterIdCode(entersVoList.get(i).getIdCard());
+                } else {
+                    orderTicketEntities.setEnterName(entitiesVo.getEnterName());
+                    orderTicketEntities.setEnterMobile(entitiesVo.getEnterMobile());
+                    orderTicketEntities.setEnterIdCode(entitiesVo.getEnterIdCode());
+                }
+
                 orderTicketEntities.setStatus(entitiesVo.getStatus());
                 orderTicketEntities.setSysDamai(entitiesVo.getSysDamai());
                 orderTicketEntities.setCheckClient(entitiesVo.getCheckClient());