Merge branch 'pre' into 'master'

判断票种类型

See merge request !40

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

@@ -118,6 +118,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
             }
 
+            if (payOrderParam.getIsExpress().equals(1) && ticketData.getIsExpress().equals(0)) {
+                return ResponseDto.failure("票种类型错误");//参数错误
+            } else if (payOrderParam.getIsElectronic().equals(1) && ticketData.getIsElectronic().equals(0)) {
+                return ResponseDto.failure("票种类型错误");//参数错误
+            }
+
+
             if (performanceData == null || ticketTimesData == null || ticketData == null) {
                 return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
             }
@@ -489,10 +496,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         }
 
         //是否免费
-        boolean isFree=false;
+        boolean isFree = false;
         PayResultVo payResultVo;
 
-        if(orderTickets.getPriceActual().compareTo(BigDecimal.valueOf(0))>0){
+        if (orderTickets.getPriceActual().compareTo(BigDecimal.valueOf(0)) > 0) {
             // 调用支付
             String time1 = DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketData.getUseStart()), DateUtil.Formatter.MM_dd_zh);
             String time2 = DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketData.getUseEnd()), DateUtil.Formatter.MM_dd_zh);
@@ -529,8 +536,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 payResultVo.getData().setShowUrl(payOrderParam.getShowUrl() + orderTicketId);
                 payResultVo.getData().setReturnUrl(payOrderParam.getReturnUrl() + orderTicketId);
             }
-        }else{
-            isFree=true;
+        } else {
+            isFree = true;
             orderTickets.setPayType("FREE");
             orderTickets.setPayCode("FREE_PAY_CODE");
             payResultVo = PayResultVo.getNew();
@@ -573,10 +580,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         currentTime = System.currentTimeMillis() - currentTime;
         log.debug("MQ 发送 -> time:" + (currentTime) + "毫秒");
         log.info(UserPathDto.setData("下单(唤起支付)", payOrderParam, payResultVo.getData()));
-        if(isFree){
+        if (isFree) {
             SyncOrderParam syncOrderParam = SyncOrderParam.getNew();
             syncOrderParam.setOrderCode(orderTickets.getOrderCode());
-            syncOrderParam.setPaymentAt(DateUtil.format(LocalDateTime.now(),DateUtil.Formatter.yyyyMMddHHmmss));
+            syncOrderParam.setPaymentAt(DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyyMMddHHmmss));
             syncOrderParam.setCode(orderTickets.getPayCode());
             syncOrderParam.setPrice(orderTickets.getPrice());
             syncOrderParam.setPaymentId("FREE_PAYMENT_ID");
@@ -584,7 +591,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             syncOrderParam.setStatus(1);
             syncOrder(syncOrderParam);
             return ResponseDto.success(payResultVo.getData());
-        }else {
+        } else {
             return ResponseDto.success(payResultVo.getData());
         }
     }
@@ -768,7 +775,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId(), syncOrderParam.getPaymentId(), syncOrderParam.getPaymentType());
             } else if ((orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) && syncOrderParam.getStatus().equals(1)) {
                 log.error("订单号为 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode());
-            } else if(syncOrderParam.getStatus().equals(1)){
+            } else if (syncOrderParam.getStatus().equals(1)) {
                 log.error("订单号为 {} 的订单正常流程", syncOrderParam.getOrderCode());
                 orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId());
                 orderTickets.setPaymentType(syncOrderParam.getPaymentType());
@@ -907,9 +914,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
     }
 
     public boolean checkAgent(String agentId, KylinTicketVo ticketData) {
-        if(agentId.equals(0)){
+        if (agentId.equals(0)) {
             return true;
-        }else{
+        } else {
             boolean isAgent = ticketData.getIsAgent() == 1;
             if (isAgent) {
                 return true;