|
@@ -32,10 +32,10 @@ public class SalesOrder implements Serializable {
|
|
|
private String salesPostNum; //快递单号
|
|
|
private String salesPostFirm; //快递公司
|
|
|
private String salesAddressInfo; //详细地址
|
|
|
- private String salesAddressProvinceName; //省
|
|
|
- private String salesAddressCityName; //市
|
|
|
- private String salesAddressCountryName; //区
|
|
|
- private String salesAddressDesc; //地址详情
|
|
|
+ private String salesAddressProvinceName;//省
|
|
|
+ private String salesAddressCityName; //市
|
|
|
+ private String salesAddressCountryName; //区
|
|
|
+ private String salesAddressDesc; //地址详情
|
|
|
private String salesAddressTel; //收件人电话
|
|
|
private String salesAddressName; //收件人姓名
|
|
|
private Integer salesAmount; //订单总金额
|
|
@@ -65,7 +65,7 @@ public class SalesOrder implements Serializable {
|
|
|
private Integer salesIsLocked; //是否锁定 0:否1:是
|
|
|
private Integer salesIsSeparate; //是否缺货 0:否1:是
|
|
|
private Integer salesIsDownload; //是否下载过 1 未下载 2 已下载
|
|
|
- private Integer salesMainOrderId;//主订单id(拆单用)
|
|
|
+ private Integer salesMainOrderId; //主订单id(拆单用)
|
|
|
|
|
|
private String companyName; //销售公司名称
|
|
|
private String storeName; //店铺名称
|
|
@@ -84,23 +84,23 @@ public class SalesOrder implements Serializable {
|
|
|
private List<SalesOrderItem> salesOrderItemList = new ArrayList<SalesOrderItem>();
|
|
|
|
|
|
//添加订单项属性,用于导出订单
|
|
|
- private String itemProductName; //产品名称
|
|
|
- private String itemProductColor; //产品颜色
|
|
|
- private Integer itemNum; //产品数量
|
|
|
- private String itemColorBar; //产品69码
|
|
|
- private List<String> listColorBar; //产品69码集合
|
|
|
+ private String itemProductName; //产品名称
|
|
|
+ private String itemProductColor; //产品颜色
|
|
|
+ private Integer itemNum; //产品数量
|
|
|
+ private String itemColorBar; //产品69码
|
|
|
+ private List<String> listColorBar; //产品69码集合
|
|
|
|
|
|
- private String[] salesIds; //传入mybatis的订单编号
|
|
|
- private String ids; //前台传过来的订单编号
|
|
|
+ private String[] salesIds; //传入mybatis的订单编号
|
|
|
+ private String ids; //前台传过来的订单编号
|
|
|
|
|
|
//Efast升级新增字段 2018-6-6
|
|
|
- private String styleColor;//上传订单结果颜色
|
|
|
+ private String styleColor; //上传订单结果颜色
|
|
|
|
|
|
- private String salesBatchId; //批次编号
|
|
|
- private Date batchCreateTime; //批次创建时间
|
|
|
+ private String salesBatchId; //批次编号
|
|
|
+ private Date batchCreateTime; //批次创建时间
|
|
|
|
|
|
- private Integer salesAddType; //增加订单方式 1:手动增加 2:Excel导入
|
|
|
- private Integer salesAdminId; //录入人id
|
|
|
+ private Integer salesAddType; //增加订单方式 1:手动增加 2:Excel导入
|
|
|
+ private Integer salesAdminId; //录入人id
|
|
|
|
|
|
public String getStyleColor() {
|
|
|
return styleColor;
|