Merge branch 'pre' into 'master'

实名判断提到最前面

See merge request !351

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

@@ -131,6 +131,23 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     break;
                 }
             }
+
+            //判断新商品券
+            if(payOrderParam.getVoucherCode()!=null) {
+                CandyUserCouponAssocDto couponAssocDto = dataUtils.getGoblinPlatformCoupon(payOrderParam.getVoucherCode());
+                if (couponAssocDto != null) {
+                    boolean goblinPlatformCouponseCanUse = false;
+                    for (AdamEntersVo adamEnters : entersVoList) {
+                        if (couponAssocDto.getIdNo().equals(adamEnters.getIdCard())) {
+                            goblinPlatformCouponseCanUse = true;
+                        }
+                    }
+                    if (!goblinPlatformCouponseCanUse) {
+                        return ResponseDto.failure("实名券与入场人信息不一致");
+                    }
+                }
+            }
+
             performanceId = performanceData.getPerformancesId();
             if (ticketTimesData == null || ticketData == null) {
                 return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
@@ -323,22 +340,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 return ResponseDto.failure(ErrorMapping.get("20015"));//入场人数量错误
             }
 
-            //判断新商品券
-            if(payOrderParam.getVoucherCode()!=null) {
-                CandyUserCouponAssocDto couponAssocDto = dataUtils.getGoblinPlatformCoupon(payOrderParam.getVoucherCode());
-                if (couponAssocDto != null) {
-                    boolean goblinPlatformCouponseCanUse = false;
-                    for (AdamEntersVo adamEnters : entersVoList) {
-                        if (couponAssocDto.getIdNo().equals(adamEnters.getIdCard())) {
-                            goblinPlatformCouponseCanUse = true;
-                        }
-                    }
-                    if (!goblinPlatformCouponseCanUse) {
-                        return ResponseDto.failure("实名券与入场人信息不一致");
-                    }
-                }
-            }
-
             // 判断库存
             int surplusGeneral = orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), -payOrderParam.getNumber());