增加 快递票 电子票 说明

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

@@ -42,10 +42,16 @@ public class TicketCreateParam implements Serializable {
     @NotNull(message = "不能为空")
     private Integer isElectronic;
 
+    @ApiModelProperty(value = "是否电子票", example = "0")
+    private String expressDescribes;
+
     @ApiModelProperty(value = "是否快递票", example = "0")
     @NotNull(message = "不能为空")
     private Integer isExpress;
 
+    @ApiModelProperty(value = "是否电子票", example = "0")
+    private String electronicDescribe;
+
     @ApiModelProperty(value = "价格", example = "100.00")
     @NotNull(message = "不能为空")
     private BigDecimal price;

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

@@ -63,6 +63,12 @@ public class KylinTicketPartnerVo implements Serializable {
     @ApiModelProperty(value = "票种说明", example = "这是票种说明")
     private String describes;
 
+    @ApiModelProperty(value = "快递票种说明", example = "这是票种说明")
+    private String describesExpress;
+
+    @ApiModelProperty(value = "电子票种说明", example = "这是票种说明")
+    private String describeElectronic;
+
     @ApiModelProperty(value = "票状态 -1删除;0未提交;1审核中;2审核中（自动在售）;3审核通过;4审核未通过;6在售;7停售;8售罄;9未开始;10已结束", example = "0")
     private Integer status;
 

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

@@ -116,6 +116,12 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
             kylinTicketPartnerVo.setStatus(0);
             kylinTicketPartnerVo.setDefault();
+            if(ticketCreateParam.getIsExpress()==1){
+                kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getExpressDescribes());
+            }
+            if(ticketCreateParam.getIsElectronic()==1){
+                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getElectronicDescribe());
+            }
 
             if (ticketCreateParam.getIsExpress() == 1) {
                 kylinTicketPartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -156,6 +162,12 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setUseStart(kylinTicketTimesPartnerVo.getUseStart());
             kylinTicketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd());
             kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
+            if(ticketCreateParam.getIsExpress()==1){
+                kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getExpressDescribes());
+            }
+            if(ticketCreateParam.getIsElectronic()==1){
+                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getElectronicDescribe());
+            }
             kylinTicketPartnerVo.setStatus(-2);
             kylinTicketPartnerVo.setDefault();
 
@@ -199,6 +211,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             kylinTicketPartnerVo.setTimesId(null);
             kylinTicketPartnerVo.setStatus(null);
+            if(ticketCreateParam.getIsExpress()==1){
+                kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getExpressDescribes());
+            }
+            if(ticketCreateParam.getIsElectronic()==1){
+                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getElectronicDescribe());
+            }
+
             kylinTicketPartnerVo.setDefault();
             if (ticketCreateParam.getIsExpress() == 1) {
                 kylinTicketPartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));

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

@@ -400,6 +400,10 @@ public class PerformanceVoTask {
                     tickets.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEnd())));
                     if (ticketItem.getIsExpress() == 1) {
                         tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEndExpress())));
+                        tickets.setDescribeExpress(ticketItem.getDescribesExpress());
+                    }
+                    if(ticketItem.getIsElectronic() == 1){
+                        tickets.setDescribeElectronic(ticketItem.getDescribeElectronic());
                     }
                     tickets.setUseStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getUseStart())));
                     tickets.setUseEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getUseEnd())));