Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PayOrderParam.java

@@ -21,9 +21,9 @@ public class PayOrderParam {
     @NotNull(message = "必传")
     private Integer number;
 
-    @ApiModelProperty(value = "是否学生票")
-    @NotNull(message = "必传")
-    private Integer isStudent;
+//    @ApiModelProperty(value = "是否学生票")
+//    @NotNull(message = "必传")
+//    private Integer isStudent;
     @ApiModelProperty(value = "是否电子票")
     @NotNull(message = "必传")
     private Integer isElectronic;

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

@@ -27,4 +27,7 @@ public class KylinOrderTicketEntitiesVo implements Serializable {
     private String ticketTitle;
     private String useStart;
     private String useEnd;
+
+    private String createdAt;
+    private String updatedAt;
 }

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

@@ -409,6 +409,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntitiesVo.setTicketTitle(ticketData.getTitle());
                 orderTicketEntitiesVo.setUseStart(ticketData.getUseStart());
                 orderTicketEntitiesVo.setUseEnd(ticketData.getUseEnd());
+                orderTicketEntitiesVo.setCreatedAt(orderTicketEntities.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                orderTicketEntitiesVo.setUpdatedAt(null);
                 mongoTemplate.insert(orderTicketEntitiesVo, KylinOrderTicketEntitiesVo.class.getSimpleName());
             }
         } else {
@@ -439,6 +441,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntitiesVo.setTicketTitle(ticketData.getTitle());
                 orderTicketEntitiesVo.setUseStart(ticketData.getUseStart());
                 orderTicketEntitiesVo.setUseEnd(ticketData.getUseEnd());
+                orderTicketEntitiesVo.setCreatedAt(orderTicketEntities.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                orderTicketEntitiesVo.setUpdatedAt(null);
                 mongoTemplate.insert(orderTicketEntitiesVo, KylinOrderTicketEntitiesVo.class.getSimpleName());
             }
         }