Merge remote-tracking branch 'origin/dev-smile' into dev-smile

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

@@ -111,6 +111,12 @@ public class KylinOrderTicketVo implements Serializable, Cloneable {
     private String ticketId;
     @ApiModelProperty(position = 15, value = "代理id")
     private String agentId;
+
+    @ApiModelProperty(position = 15, value = "代理状态[1-开启|2-关闭]")
+    private int agentStatus;
+    @ApiModelProperty(position = 15, value = "票提")
+    private BigDecimal agentDistributions;
+
     @ApiModelProperty(position = 15, value = "是否会员")
     private Integer isMember;
     @ApiModelProperty(position = 15, value = "订单过期日期")

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
@@ -19,7 +20,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class KylinOrderTicketRelations implements Serializable  ,Cloneable{
+public class KylinOrderTicketRelations implements Serializable, Cloneable {
 
     private static final long serialVersionUID = 1L;
 
@@ -56,6 +57,16 @@ public class KylinOrderTicketRelations implements Serializable  ,Cloneable{
      */
     private String agentId;
 
+    /**
+     * 代理状态[1-开启|2-关闭]
+     */
+    private int agentStatus;
+
+    /**
+     * 票提
+     */
+    private BigDecimal agentDistributions;
+
     /**
      * 购买者是否是会员
      */
@@ -98,6 +109,7 @@ public class KylinOrderTicketRelations implements Serializable  ,Cloneable{
     }
 
     private static final KylinOrderTicketRelations obj = new KylinOrderTicketRelations();
+
     public static KylinOrderTicketRelations getNew() {
         try {
             return (KylinOrderTicketRelations) obj.clone();

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/docu/db_ln_goblin_initialdata.sql

+----                添加代理字段              ----
+    alter table kylin_order_ticket_relations
+        add agent_status int default 1 comment '代理状态[1-开启|2-关闭]';
+    alter table kylin_order_ticket_relations
+        add agent_distributions decimal (8,3) default 0 comment '票提';
\ No newline at end of file