订单二维码相关

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java

@@ -7,15 +7,20 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class OrderDetailsVo implements Cloneable{
+public class OrderDetailsVo implements Cloneable {
     private KylinOrderTicketVo orderTicketVo;
     private String enterDescribe;
     private Integer expressStatus;
     private Long restTime;
     private Integer isCanRefund;
+
+    private Integer isShowQrCode;
+    private String showQrCodeTime;
+
     private List<KylinOrderRefundsOrderCodeVo> orderRefundsVoList;
 
     private static final OrderDetailsVo obj = new OrderDetailsVo();
+
     public static OrderDetailsVo getNew() {
         try {
             return (OrderDetailsVo) obj.clone();

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

@@ -124,8 +124,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 //            checkOrderTime(uid);
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
             currentTime = System.currentTimeMillis() - currentTime;
-            if(uid.equals("809406") || uid.equals("773650")) {
-            }else{
+            if (uid.equals("809406") || uid.equals("773650")) {
+            } else {
                 if (!orderTicketVo.getUserId().equals(uid)) {
                     return null;
                 }
@@ -204,7 +204,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                         break;
                     }
                     OrderRefundListVo data = OrderRefundListVo.getNew();
-                    if(item.getOrderRefundCode().length()>20) {
+                    if (item.getOrderRefundCode().length() > 20) {
                         data.setOrderRefundCode(item.getOrderRefundCode().substring(item.getOrderRefundCode().length() - 10));
                     }
                     data.setOrderRefundsId(item.getOrderRefundsId());
@@ -232,16 +232,19 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 }
 
                 orderTicketVo.setOrderRefundListVos(orderRefundListVos);
-                if(orderTicketVo.getOrderCode().length()>20) {
+                if (orderTicketVo.getOrderCode().length() > 20) {
                     orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
                 }
+
+                vo.setIsShowQrCode(ticketVo.getIsShowCode());
+                vo.setShowQrCodeTime(ticketVo.getQrCodeShowTime() == null ? "" : ticketVo.getQrCodeShowTime());
                 vo.setOrderTicketVo(orderTicketVo);
                 vo.setEnterDescribe(dataUtils.getEnterInfo(performanceVo.getType(), orderTicketVo.getGetTicketType(), orderTicketVo.getIsStudent(), ticketVo.getIsTrueName()));
             }
             log.info(UserPathDto.setData("订单详情", orderId, vo));
             return vo;
         } catch (Exception e) {
-            log.info("订单详情异常:",e);
+            log.info("订单详情异常:", e);
             return null;
         }
     }
@@ -279,8 +282,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
             List<KylinOrderRefundsVo> kylinOrderRefundsVoBaseList = dataUtils.getOrderRefundVoByOrderId(orderTicketVo.getOrderTicketsId());
 
-            if(uid.equals("809406") || uid.equals("773650")) {
-            }else{
+            if (uid.equals("809406") || uid.equals("773650")) {
+            } else {
                 if (!orderTicketVo.getUserId().equals(uid)) {
                     return ResponseDto.failure(ErrorMapping.get("20003"));
                 }
@@ -302,7 +305,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 kylinOrderTicketEntitiesPreRefundVos.add(refundVo);
             }
             orderTicketVo.setFieldName(performanceVo.getFieldName());
-            if(orderTicketVo.getOrderCode().length()>20) {
+            if (orderTicketVo.getOrderCode().length() > 20) {
                 orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
             }
             BeanUtils.copyProperties(orderTicketVo, vo);
@@ -323,18 +326,18 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
             KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
 
-            if(uid.equals("809406") || uid.equals("773650")) {
-            }else{
+            if (uid.equals("809406") || uid.equals("773650")) {
+            } else {
                 if (!orderTicketVo.getUserId().equals(uid)) {
                     return ResponseDto.failure(ErrorMapping.get("20003"));
                 }
             }
             orderTicketVo.setFieldName(performanceVo.getFieldName());
-            if(orderTicketVo.getOrderCode().length()>20) {
+            if (orderTicketVo.getOrderCode().length() > 20) {
                 orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
             }
             KylinOrderRefundsVo kylinOrderRefundsVoBase = dataUtils.getOrderRefundVo(orderRefundId);
-            if(kylinOrderRefundsVoBase.getOrderRefundCode().length()>20) {
+            if (kylinOrderRefundsVoBase.getOrderRefundCode().length() > 20) {
                 kylinOrderRefundsVoBase.setOrderRefundCode(kylinOrderRefundsVoBase.getOrderRefundCode().substring(kylinOrderRefundsVoBase.getOrderRefundCode().length() - 10));
             }
             vo.setKylinOrderRefundsVoBaseList(kylinOrderRefundsVoBase);
@@ -353,8 +356,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             String uid = CurrentUtil.getCurrentUid();
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
             List<KylinOrderRefundsVo> kylinOrderRefundsVoBaseList = dataUtils.getOrderRefundVoByOrderId(orderTicketVo.getOrderTicketsId());
-            if(uid.equals("809406") || uid.equals("773650")) {
-            }else{
+            if (uid.equals("809406") || uid.equals("773650")) {
+            } else {
                 if (!orderTicketVo.getUserId().equals(uid)) {
                     return "无权查看";
                 }
@@ -527,7 +530,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 entitiesTable.setIsPayment(newIsPayment);
                 entitiesTable.setUpdatedAt(time);
 
-                log.info("sqlsDataB data = "+entitiesTable.getIsPayment());
+                log.info("sqlsDataB data = " + entitiesTable.getIsPayment());
 
                 sqlsDataB.add(new Object[]{
                         entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), item.getOrderTicketEntitiesId(), now, now