|
|
@@ -3,7 +3,6 @@ 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;
|
|
|
@@ -61,6 +60,11 @@ public class OrderDon extends BaseEntity implements Serializable {
|
|
|
/** 金额 */
|
|
|
private BigDecimal money;
|
|
|
|
|
|
+ /**
|
|
|
+ * 押金
|
|
|
+ */
|
|
|
+ private BigDecimal deposit;
|
|
|
+
|
|
|
/**
|
|
|
* 加购商品金额
|
|
|
*/
|
|
|
@@ -122,6 +126,11 @@ public class OrderDon extends BaseEntity implements Serializable {
|
|
|
*/
|
|
|
private Long couponUserId;
|
|
|
|
|
|
+ /**
|
|
|
+ * 优惠券id
|
|
|
+ */
|
|
|
+ private Long couponId;
|
|
|
+
|
|
|
/**
|
|
|
* 购买数量
|
|
|
*/
|
|
|
@@ -287,6 +296,19 @@ 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 {
|
|
|
/**
|
|
|
* 订单状态
|