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
b6ac3678
Commit
b6ac3678
authored
Sep 09, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单无收货人时,无法保存收货方式的数据bug修复
parent
f17caac1
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
0 deletions
+18
-0
20240909.sql
sql/v2.1/20240909.sql
+4
-0
OrderDO.java
...oder/yudao/module/order/dal/dataobject/order/OrderDO.java
+3
-0
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+2
-0
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
OrderQueryVO.java
.../cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java
+3
-0
No files found.
sql/v2.1/20240909.sql
View file @
b6ac3678
-- 当订单无收货人时,收货方式无法保存的bug修复
alter
table
`ecw_order`
add
column
`harvest_method`
tinyint
DEFAULT
'1'
COMMENT
'收货方式:1 自提 2 送货上门'
;
-- 放货箱数与放货率
alter
table
`ecw_order`
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 @
b6ac3678
...
...
@@ -406,6 +406,9 @@ public class OrderDO extends BaseDO {
@ApiModelProperty
(
value
=
"送货时间"
)
private
Date
deliveryDate
;
@ApiModelProperty
(
value
=
"收货方式:1 自提 2 送货上门 "
)
private
Integer
harvestMethod
;
/**
* 入仓时间
*/
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @
b6ac3678
...
...
@@ -6386,6 +6386,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
newOrder
.
setPickleType
(
null
);
newOrder
.
setPickRatio
(
null
);
newOrder
.
setPickNum
(
null
);
newOrder
.
setReleaseRatio
(
null
);
newOrder
.
setReleaseNum
(
null
);
newOrder
.
setCost
(
null
);
newOrder
.
setPackingListUrl
(
null
);
newOrder
.
setCommissionPayable
(
null
);
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackVO.java
View file @
b6ac3678
...
...
@@ -341,6 +341,9 @@ public class OrderBackVO {
@ExcelProperty
(
"送货时间"
)
private
Date
deliveryDate
;
@ApiModelProperty
(
value
=
"收货方式:1 自提 2 送货上门 "
)
private
Integer
harvestMethod
;
@ExcelProperty
(
"入仓时间"
)
@DateTimeFormat
(
pattern
=
FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND
)
@ApiModelProperty
(
value
=
"入仓时间"
)
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBaseVO.java
View file @
b6ac3678
...
...
@@ -282,6 +282,9 @@ public class OrderBaseVO {
// @NotNull(message = "送货时间不能为空")
private
Date
deliveryDate
;
@ApiModelProperty
(
value
=
"收货方式:1 自提 2 送货上门 "
)
private
Integer
harvestMethod
;
@ApiModelProperty
(
value
=
"特需类型ids"
)
private
String
packageType
;
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java
View file @
b6ac3678
...
...
@@ -259,6 +259,9 @@ public class OrderQueryVO {
@ApiModelProperty
(
value
=
"是否限制修改收货人"
)
private
Boolean
isLimitUpdateConsignee
;
@ApiModelProperty
(
value
=
"收货方式:1 自提 2 送货上门 "
)
private
Integer
harvestMethod
;
@ApiModelProperty
(
value
=
"开始放货锁定收货人到期时间"
)
@DateTimeFormat
(
pattern
=
FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND
)
@JsonFormat
(
pattern
=
FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND
)
...
...
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