fix

netflix-dao/src/main/java/com/cyksj/model/entity/OrderDon.java

@@ -3,6 +3,7 @@ package com.cyksj.model.entity;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.cyksj.model.BaseEntity;
 import com.ejlchina.searcher.bean.DbIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
@@ -60,11 +61,6 @@ public class OrderDon extends BaseEntity implements Serializable {
     /** 金额 */
     private BigDecimal money;
 
-    /**
-     * 押金
-     */
-    private BigDecimal deposit;
-
     /**
      * 加购商品金额
      */
@@ -126,11 +122,6 @@ public class OrderDon extends BaseEntity implements Serializable {
      */
     private Long couponUserId;
 
-    /**
-     * 优惠券id
-     */
-    private Long couponId;
-
     /**
      * 购买数量
      */
@@ -296,19 +287,6 @@ public class OrderDon extends BaseEntity implements Serializable {
      */
     private String phone;
 
-    @DbIgnore
-    @TableField(exist = false)
-    private Boolean isMirror;
-
-    @DbIgnore
-    @TableField(exist = false)
-    @JsonIgnore
-    private OrderDonUserDiscountPopularizeRecord discountPopularizeRecord;
-
-    @TableField(exist = false)
-    @JsonIgnore
-    private Integer goodsDonType;
-
     public enum Status {
         /**
          * 订单状态
@@ -344,7 +322,8 @@ public class OrderDon extends BaseEntity implements Serializable {
         PAY_EQUIPMENT("pay_equipment", "自购设备"),
         BALANCE("balance", "余额支付"),
         PAYPAL("paypal","paypal支付"),
-        STRIPE("stripe","stripe支付")
+        STRIPE("stripe","stripe支付"),
+        TICKET_REPLACE("ticket_replace", "车票替换"),
         ;
         String type;
         String desc;

netflix-dao/src/main/java/com/cyksj/model/entity/UserTicketClearedRecord.java

@@ -1,5 +1,6 @@
 package com.cyksj.model.entity;
 
+import com.cyksj.model.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,7 +14,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class UserTicketClearedRecord extends BaseEntity{
+public class UserTicketClearedRecord extends BaseEntity {
 	private Long userId;
 
 	private Long accountId;
@@ -31,6 +32,11 @@ public class UserTicketClearedRecord extends BaseEntity{
 
 	private Long relationId;
 
+	/**
+	 * 镜像用户token
+	 */
+	private String userToken;
+
 	private Long yhsId;
 
 	private Integer num;
@@ -58,7 +64,9 @@ public class UserTicketClearedRecord extends BaseEntity{
 		abnormal("异常订单"),
 		dp("优惠加购订单退款"),
 		manual("手动清除"),
-		refund("退款")
+		refund("退款"),
+		vip_refund("会员退款"),
+		ticket_replace("替换车票")
 		;
 		String desc;