Merge branch 'master' into dev_20111115

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

@@ -292,6 +292,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
             if (surplusGeneral < 0) {//库存回滚
                 orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
+                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                 return ResponseDto.failure(ErrorMapping.get("20016"));//没抢到
             } else {
                 isDownGeneral = true;
@@ -301,6 +302,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 if (isTrueName == 1) {
                     for (AdamEntersVo adamEnters : entersVos) {
                         if (adamEnters == null) {
+                            orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
+                            orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                             return ResponseDto.failure("入场人数据错误");
                         }
                         entersVoList.add(adamEnters);
@@ -342,6 +345,7 @@ 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);
                 for (AdamEntersVo enters : entersVoList) {
                     dataUtils.changeBuyInfo(uid, enters.getIdCard(), payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), -1);
                 }