Commit 779aca78 authored by zhengyi's avatar zhengyi

订单无收货人时,无法保存收货地址的数据bug修复

parent b6ac3678
-- 当订单无收货人时,收货方式无法保存的bug修复 -- 当订单无收货人时,收货方式无法保存的bug修复
alter table `ecw_order` alter table `ecw_order`
add column `harvest_method` tinyint DEFAULT '1' COMMENT '收货方式:1 自提 2 送货上门'; add column `harvest_method` tinyint DEFAULT '1' COMMENT '收货方式:1 自提 2 送货上门';
alter table `ecw_order`
add column `consignee_address` varchar(255) DEFAULT '' COMMENT '收货地址';
@ApiModelProperty(value = "收货地址")
private String consigneeAddress;
-- 放货箱数与放货率 -- 放货箱数与放货率
alter table `ecw_order` alter table `ecw_order`
add column `release_ratio` decimal(5,2) DEFAULT '0.00' COMMENT '放货率'; add column `release_ratio` decimal(5,2) DEFAULT '0.00' COMMENT '放货率';
......
...@@ -409,6 +409,8 @@ public class OrderDO extends BaseDO { ...@@ -409,6 +409,8 @@ public class OrderDO extends BaseDO {
@ApiModelProperty(value = "收货方式:1 自提 2 送货上门 ") @ApiModelProperty(value = "收货方式:1 自提 2 送货上门 ")
private Integer harvestMethod; private Integer harvestMethod;
@ApiModelProperty(value = "送货地址 ")
private String address;
/** /**
* 入仓时间 * 入仓时间
*/ */
......
...@@ -424,9 +424,12 @@ public class OrderBackInfoDto { ...@@ -424,9 +424,12 @@ public class OrderBackInfoDto {
@ApiModelProperty(value = "送货时间") @ApiModelProperty(value = "送货时间")
private Date deliveryDate; private Date deliveryDate;
@ApiModelProperty(value = "收方式:1 自提 2 送货上门 ") @ApiModelProperty(value = "收方式:1 自提 2 送货上门 ")
private Integer harvestMethod; private Integer harvestMethod;
@ApiModelProperty(value = "收货地址")
private String consigneeAddress;
@ApiModelProperty(value = "收货地址的国家") @ApiModelProperty(value = "收货地址的国家")
private Long country; private Long country;
...@@ -436,9 +439,6 @@ public class OrderBackInfoDto { ...@@ -436,9 +439,6 @@ public class OrderBackInfoDto {
@ApiModelProperty(value = "收货地址的市") @ApiModelProperty(value = "收货地址的市")
private Long city; private Long city;
@ApiModelProperty(value = "收货地址")
private String consigneeAddress;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
......
...@@ -344,6 +344,9 @@ public class OrderBackVO { ...@@ -344,6 +344,9 @@ public class OrderBackVO {
@ApiModelProperty(value = "收货方式:1 自提 2 送货上门 ") @ApiModelProperty(value = "收货方式:1 自提 2 送货上门 ")
private Integer harvestMethod; private Integer harvestMethod;
@ApiModelProperty(value = "收货地址")
private String consigneeAddress;
@ExcelProperty("入仓时间") @ExcelProperty("入仓时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "入仓时间") @ApiModelProperty(value = "入仓时间")
......
...@@ -285,6 +285,9 @@ public class OrderBaseVO { ...@@ -285,6 +285,9 @@ public class OrderBaseVO {
@ApiModelProperty(value = "收货方式:1 自提 2 送货上门 ") @ApiModelProperty(value = "收货方式:1 自提 2 送货上门 ")
private Integer harvestMethod; private Integer harvestMethod;
@ApiModelProperty(value = "收货地址")
private String consigneeAddress;
@ApiModelProperty(value = "特需类型ids") @ApiModelProperty(value = "特需类型ids")
private String packageType; private String packageType;
......
...@@ -80,14 +80,8 @@ public class OrderCreateReqVO extends OrderBaseVO { ...@@ -80,14 +80,8 @@ public class OrderCreateReqVO extends OrderBaseVO {
@ApiModelProperty(value = "市") @ApiModelProperty(value = "市")
private Long city; private Long city;
@ApiModelProperty(value = "收货地址")
private String consigneeAddress;
@ApiModelProperty(value = "自定义付款人清单(name 详见字典 自定义付款人(custom_drawee), value 1 发货人 2 收货人)") @ApiModelProperty(value = "自定义付款人清单(name 详见字典 自定义付款人(custom_drawee), value 1 发货人 2 收货人)")
private List<CustomDraweeVO> customDraweeVOList; private List<CustomDraweeVO> customDraweeVOList;
@ApiModelProperty(value = "收获方式:1 自提 2 送货上门 ")
private Integer harvestMethod;
@ApiModelProperty(value = "优惠使用人") @ApiModelProperty(value = "优惠使用人")
private Long couponCustomerId; private Long couponCustomerId;
......
...@@ -91,8 +91,6 @@ public class OrderUpdateReqVO extends OrderBaseVO { ...@@ -91,8 +91,6 @@ public class OrderUpdateReqVO extends OrderBaseVO {
@ApiModelProperty(value = "自定义付款人清单(name 详见字典 自定义付款人(custom_drawee), value 1 发货人 2 收货人)") @ApiModelProperty(value = "自定义付款人清单(name 详见字典 自定义付款人(custom_drawee), value 1 发货人 2 收货人)")
private List<CustomDraweeVO> customDraweeVOList; private List<CustomDraweeVO> customDraweeVOList;
@ApiModelProperty(value = "收获方式:1 自提 2 送货上门 ")
private Integer harvestMethod;
// //
// @ApiModelProperty(value = "地址", required = true) // @ApiModelProperty(value = "地址", required = true)
// private String address; // private String address;
...@@ -118,10 +116,6 @@ public class OrderUpdateReqVO extends OrderBaseVO { ...@@ -118,10 +116,6 @@ public class OrderUpdateReqVO extends OrderBaseVO {
@ApiModelProperty(value = "市") @ApiModelProperty(value = "市")
private Long city; private Long city;
@ApiModelProperty(value = "收货地址", required = true)
private String consigneeAddress;
@ApiModelProperty(value = "抄送人(id逗号拼接)") @ApiModelProperty(value = "抄送人(id逗号拼接)")
private String ccIds; private String ccIds;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment