Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
779aca78
Commit
779aca78
authored
Sep 09, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单无收货人时,无法保存收货地址的数据bug修复
parent
b6ac3678
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
16 deletions
+16
-16
20240909.sql
sql/v2.1/20240909.sql
+4
-0
OrderDO.java
...oder/yudao/module/order/dal/dataobject/order/OrderDO.java
+2
-0
OrderBackInfoDto.java
...a/cn/iocoder/yudao/module/order/dto/OrderBackInfoDto.java
+4
-4
OrderBackVO.java
...a/cn/iocoder/yudao/module/order/vo/order/OrderBackVO.java
+3
-0
OrderBaseVO.java
...a/cn/iocoder/yudao/module/order/vo/order/OrderBaseVO.java
+3
-0
OrderCreateReqVO.java
...iocoder/yudao/module/order/vo/order/OrderCreateReqVO.java
+0
-6
OrderUpdateReqVO.java
...iocoder/yudao/module/order/vo/order/OrderUpdateReqVO.java
+0
-6
No files found.
sql/v2.1/20240909.sql
View file @
779aca78
-- 当订单无收货人时,收货方式无法保存的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
'放货率'
;
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/order/OrderDO.java
View file @
779aca78
...
@@ -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
;
/**
/**
* 入仓时间
* 入仓时间
*/
*/
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dto/OrderBackInfoDto.java
View file @
779aca78
...
@@ -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
;
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackVO.java
View file @
779aca78
...
@@ -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
=
"入仓时间"
)
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBaseVO.java
View file @
779aca78
...
@@ -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
;
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderCreateReqVO.java
View file @
779aca78
...
@@ -80,15 +80,9 @@ public class OrderCreateReqVO extends OrderBaseVO {
...
@@ -80,15 +80,9 @@ 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
;
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderUpdateReqVO.java
View file @
779aca78
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment