Merge branch 'dev_order' into pre

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

@@ -209,10 +209,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 if (isOldMember) {
 
                 } else {
-                    advanceMap = orderUtils.useCoupon(payOrderParam.getAdvanceCode(), "购买 " + performanceData.getTitle(), BigDecimal.ZERO, payOrderParam.getPerformanceId(), payOrderParam.getTimeId(), payOrderParam.getTicketId());
-                    Integer typeVoucher = (Integer) advanceMap.get("type");
-                    if (typeVoucher.equals(-1)) {
-                        return ResponseDto.failure("优先券券不可用");
+                    if (memberType == 1) {
+                        advanceMap = orderUtils.useCoupon(payOrderParam.getAdvanceCode(), "购买 " + performanceData.getTitle(), BigDecimal.ZERO, payOrderParam.getPerformanceId(), payOrderParam.getTimeId(), payOrderParam.getTicketId());
+                        Integer typeVoucher = (Integer) advanceMap.get("type");
+                        if (typeVoucher.equals(-1)) {
+                            return ResponseDto.failure("优先券券不可用");
+                        }
                     }
                 }
             }
@@ -1106,11 +1108,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
                     long orderTicketEntitiesKey;
                     if (item.getOrderTicketEntitiesId().length() > 13) {
-                        if(isMember==1){
+                        if (isMember == 1) {
                             orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("010"));
                             obj3.setExt("登登登VIP");
-                            obj3.setTicketItemId(Long.valueOf(ticketIdKey+"".concat("010")));
-                        }else{
+                            obj3.setTicketItemId(Long.valueOf(ticketIdKey + "".concat("010")));
+                        } else {
                             orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("020"));
                             obj3.setExt("");
                             obj3.setTicketItemId(ticketIdKey);
@@ -1120,7 +1122,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     }
                     obj3.setPerformId(ticketTimesKey);//场次id
                     obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id
-                    obj3.setQrCode("http://m.zhengzai.tv?c="+IDGenerator.ticketQrCode(item.getOrderTicketEntitiesId()));
+                    obj3.setQrCode("http://m.zhengzai.tv?c=" + IDGenerator.ticketQrCode(item.getOrderTicketEntitiesId()));
                     obj3.setOrderId(orderIdKey);//订单id orderId
                     obj3.setMediumType(orderData.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子
                     obj3.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());