Merge branch 'dev' into test

liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-base/src/main/java/com/liquidnet/common/exception/entity/Error.java

@@ -11,6 +11,7 @@ import java.util.List;
 public class Error {
     String message;
     String code;
+    Object data;
 
 
     public Error() {
@@ -20,20 +21,4 @@ public class Error {
         this.code = code;
         this.message = message;
     }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java

@@ -203,7 +203,7 @@ public class KylinOrderTickets implements Serializable {
                 orderTicketsId, userId, userName, userMobile, performanceTitle, orderCode, qrCode, orderType, orderVersion,
                 number, price, priceMember, priceTotal, priceVoucher, priceActual, priceExpress, priceRefund, refundNumber,
                 payType, paymentType, timePay, expressContacts, expressAddress, expressPhone, couponType, getTicketType,
-                getTicketDescribe, payCountdownMinute, comment, createdAt, updatedAt,payCode
+                getTicketDescribe, payCountdownMinute, comment, createdAt, updatedAt, payCode
         };
     }
 
@@ -212,9 +212,9 @@ public class KylinOrderTickets implements Serializable {
      *
      * @return
      */
-    public Object[] getPayAgainObject(LocalDateTime updateTime,LocalDateTime createTime) {
+    public Object[] getPayAgainObject(LocalDateTime updateTime, LocalDateTime createTime) {
         return new Object[]{
-                 updatedAt, orderCode, orderTicketsId,updateTime,createTime
+                orderCode, updatedAt, orderTicketsId, updateTime, createTime
         };
     }
 
@@ -223,9 +223,9 @@ public class KylinOrderTickets implements Serializable {
      *
      * @return
      */
-    public Object[] getSynOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
+    public Object[] getSynOrderObject(LocalDateTime updateTime, LocalDateTime createTime) {
         return new Object[]{
-                paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId,updateTime,createTime
+                paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId, updateTime, createTime
         };
     }
 

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

@@ -942,6 +942,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             checkOrderTime(uid);
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
             if (!orderTicketVo.getUserId().equals(uid)) {
+                log.error("ORDER_TICKET_USER_ID : {}",orderTicketVo.getUserId());
+                log.error("TOKEN UID : {}",uid);
                 return null;
             }
             if (null != orderTicketVo) {