Merge branch 'master_压测' into dev_20111115

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java

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

@@ -308,6 +308,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                         }
                         entersVoList.add(adamEnters);
                         if (isStudent == 1) {
+                            if (adamEnters.getType() != 1) {
+                                orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
+                                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
+                                return ResponseDto.failure(ErrorMapping.get("20031"));//不符合购买条件
+                            }
                             int age = IDCard.getAgeByIdCard(adamEnters.getIdCard());
                             if (age > 25) {
                                 orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
@@ -345,7 +350,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             log.error("Kylin Order Pay Error = {}", e);
             if (isDownGeneral) {
                 orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
-//                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
+                log.error("回滚库存");
+                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                 for (AdamEntersVo enters : entersVoList) {
                     dataUtils.changeBuyInfo(uid, enters.getIdCard(), payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), -1);
                 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/errors.properties

@@ -34,6 +34,7 @@
 20027=您已支付请刷新再试
 20029=未选择支付方式
 20030=券不可用
+20031=不符合购买条件
 
 #APP PARTNER
 20101=添加失败