|
|
|
@ -21,9 +21,7 @@ public @Data class UpdateOrder implements Serializable {
|
|
|
|
|
// 订单ID
|
|
|
|
|
@NotNull
|
|
|
|
|
private Integer id;
|
|
|
|
|
/**
|
|
|
|
|
* 1-卡,2-劵,3-常规
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
// 订单类型
|
|
|
|
|
@NotNull
|
|
|
|
|
private Integer orderType;
|
|
|
|
@ -31,9 +29,7 @@ public @Data class UpdateOrder implements Serializable {
|
|
|
|
|
// 批次号
|
|
|
|
|
private String batchNo;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 1-微信订单,2-商城订单,3-客服下单,4-采摘订单
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
// 订单来源
|
|
|
|
|
private Integer orderSource;
|
|
|
|
|
|
|
|
|
@ -72,93 +68,11 @@ public @Data class UpdateOrder implements Serializable {
|
|
|
|
|
private Integer createUserId;
|
|
|
|
|
// 单位
|
|
|
|
|
private Integer companyId;
|
|
|
|
|
/**
|
|
|
|
|
* 客户名称
|
|
|
|
|
*/
|
|
|
|
|
private String name;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 客户代码
|
|
|
|
|
*/
|
|
|
|
|
private String memberCode;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 客户联系方式
|
|
|
|
|
*/
|
|
|
|
|
private String phone;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 付款方式
|
|
|
|
|
*/
|
|
|
|
|
@NotNull
|
|
|
|
|
private Integer paymentMode;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 附加付款方式
|
|
|
|
|
*/
|
|
|
|
|
private Integer otherPaymentMode;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 支付关系编号(卡号/券号)
|
|
|
|
|
*/
|
|
|
|
|
private String paymentRelationNo;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 收货人手机
|
|
|
|
|
*/
|
|
|
|
|
@NotNull
|
|
|
|
|
@NotBlank
|
|
|
|
|
private String consigneePhone;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 收货人姓名
|
|
|
|
|
*/
|
|
|
|
|
@NotNull
|
|
|
|
|
@NotBlank
|
|
|
|
|
private String consigneeName;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 收货人地址
|
|
|
|
|
*/
|
|
|
|
|
@NotNull
|
|
|
|
|
@NotBlank
|
|
|
|
|
private String consigneeAddress;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 订单备注
|
|
|
|
|
*/
|
|
|
|
|
private String remark;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 折扣
|
|
|
|
|
*/
|
|
|
|
|
private Double discount;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 是否显示金额
|
|
|
|
|
*/
|
|
|
|
|
private Integer isShowAmount;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 操作人
|
|
|
|
|
*/
|
|
|
|
|
private Integer createUserId;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 单位
|
|
|
|
|
*/
|
|
|
|
|
private Integer companyId;
|
|
|
|
|
/**
|
|
|
|
|
* 客户经理
|
|
|
|
|
*/
|
|
|
|
|
private Integer managerId;
|
|
|
|
|
/**
|
|
|
|
|
* 折扣金额
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
private BigDecimal discountPrice;
|
|
|
|
|
/**
|
|
|
|
|
* 订单总金额(劵直接取,卡、常规订单后台在计算金额)
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
private BigDecimal totalPrice;
|
|
|
|
|
|
|
|
|
|
private Date appointmentTime;
|
|
|
|
@ -166,34 +80,44 @@ public @Data class UpdateOrder implements Serializable {
|
|
|
|
|
@NotEmpty
|
|
|
|
|
private List<OrderItem> orderItemList;
|
|
|
|
|
|
|
|
|
|
// 订单项
|
|
|
|
|
public static class OrderItem implements Serializable {
|
|
|
|
|
// 商品编码
|
|
|
|
|
@NotNull
|
|
|
|
|
private String itemCode;
|
|
|
|
|
// 订单项ID
|
|
|
|
|
@NotNull
|
|
|
|
|
private Integer orderItemId;
|
|
|
|
|
// 商品数量
|
|
|
|
|
@NotNull
|
|
|
|
|
private BigDecimal itemQty;
|
|
|
|
|
|
|
|
|
|
// 获取商品编码
|
|
|
|
|
public String getItemCode() {
|
|
|
|
|
return itemCode;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 设置商品编码
|
|
|
|
|
public void setItemCode(String itemCode) {
|
|
|
|
|
this.itemCode = itemCode;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 获取订单项ID
|
|
|
|
|
public Integer getOrderItemId() {
|
|
|
|
|
return orderItemId;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 设置订单项ID
|
|
|
|
|
public void setOrderItemId(Integer orderItemId) {
|
|
|
|
|
this.orderItemId = orderItemId;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 获取商品数量
|
|
|
|
|
public BigDecimal getItemQty() {
|
|
|
|
|
return itemQty;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 设置商品数量
|
|
|
|
|
public void setItemQty(BigDecimal itemQty) {
|
|
|
|
|
this.itemQty = itemQty;
|
|
|
|
|
}
|
|
|
|
|