|
|
@@ -8,49 +8,60 @@ public class OrderVo implements Serializable { |
|
|
/*租户ID**/ |
|
|
/*租户ID**/ |
|
|
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") |
|
|
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") |
|
|
private String tenantId; |
|
|
private String tenantId; |
|
|
|
|
|
/*商户ID**/ |
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") |
|
|
|
|
|
private Long merchantId; |
|
|
/*订单ID**/ |
|
|
/*订单ID**/ |
|
|
@io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") |
|
|
@io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") |
|
|
private Long orderId; |
|
|
private Long orderId; |
|
|
/*卡券ID**/ |
|
|
/*卡券ID**/ |
|
|
@io.swagger.annotations.ApiModelProperty(value="卡券ID",name="couponId") |
|
|
@io.swagger.annotations.ApiModelProperty(value="卡券ID",name="couponId") |
|
|
private Long couponId; |
|
|
private Long couponId; |
|
|
/*商户ID**/ |
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") |
|
|
|
|
|
private Long merchantId; |
|
|
|
|
|
/*c端用户id**/ |
|
|
/*c端用户id**/ |
|
|
@io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") |
|
|
@io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") |
|
|
private Long cUserId; |
|
|
private Long cUserId; |
|
|
|
|
|
/*b端用户id**/ |
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value="b端用户id",name="bUserId") |
|
|
|
|
|
private Long bUserId; |
|
|
/*订单状态**/ |
|
|
/*订单状态**/ |
|
|
@io.swagger.annotations.ApiModelProperty(value="订单状态",name="status") |
|
|
|
|
|
private Integer status; |
|
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value="订单状态",name="orderStatus") |
|
|
|
|
|
private Integer orderStatus; |
|
|
/*券状态**/ |
|
|
/*券状态**/ |
|
|
@io.swagger.annotations.ApiModelProperty(value="券状态",name="status") |
|
|
@io.swagger.annotations.ApiModelProperty(value="券状态",name="status") |
|
|
private Integer couponStatus; |
|
|
private Integer couponStatus; |
|
|
|
|
|
|
|
|
public String getTenantId() { |
|
|
|
|
|
|
|
|
public String getTenantId() { |
|
|
return tenantId; |
|
|
return tenantId; |
|
|
} |
|
|
} |
|
|
public void setTenantId(String _tenantId) { |
|
|
|
|
|
tenantId = _tenantId; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setTenantId(String tenantId) { |
|
|
|
|
|
this.tenantId = tenantId; |
|
|
} |
|
|
} |
|
|
public Long getOrderId() { |
|
|
|
|
|
return orderId; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Long getMerchantId() { |
|
|
|
|
|
return merchantId; |
|
|
} |
|
|
} |
|
|
public void setOrderId(Long _orderId) { |
|
|
|
|
|
orderId = _orderId; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setMerchantId(Long merchantId) { |
|
|
|
|
|
this.merchantId = merchantId; |
|
|
} |
|
|
} |
|
|
public Long getCouponId() { |
|
|
|
|
|
return couponId; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Long getOrderId() { |
|
|
|
|
|
return orderId; |
|
|
} |
|
|
} |
|
|
public void setCouponId(Long _couponId) { |
|
|
|
|
|
couponId = _couponId; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setOrderId(Long orderId) { |
|
|
|
|
|
this.orderId = orderId; |
|
|
} |
|
|
} |
|
|
public Long getMerchantId() { |
|
|
|
|
|
return merchantId; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Long getCouponId() { |
|
|
|
|
|
return couponId; |
|
|
} |
|
|
} |
|
|
public void setMerchantId(Long _merchantId) { |
|
|
|
|
|
merchantId = _merchantId; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setCouponId(Long couponId) { |
|
|
|
|
|
this.couponId = couponId; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public Long getcUserId() { |
|
|
public Long getcUserId() { |
|
|
return cUserId; |
|
|
return cUserId; |
|
|
} |
|
|
} |
|
|
@@ -59,12 +70,20 @@ public class OrderVo implements Serializable { |
|
|
this.cUserId = cUserId; |
|
|
this.cUserId = cUserId; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public Integer getStatus() { |
|
|
|
|
|
return status; |
|
|
|
|
|
|
|
|
public Long getbUserId() { |
|
|
|
|
|
return bUserId; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setbUserId(Long bUserId) { |
|
|
|
|
|
this.bUserId = bUserId; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public Integer getOrderStatus() { |
|
|
|
|
|
return orderStatus; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public void setStatus(Integer status) { |
|
|
|
|
|
this.status = status; |
|
|
|
|
|
|
|
|
public void setOrderStatus(Integer orderStatus) { |
|
|
|
|
|
this.orderStatus = orderStatus; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public Integer getCouponStatus() { |
|
|
public Integer getCouponStatus() { |
|
|
|