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
b94caa15
Commit
b94caa15
authored
Aug 23, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
海运与空运的到仓时间更新到订单业务修改
Signed-off-by:
zhengyi
<
landuo321@aliyun.com
>
parent
771f9571
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
OrderBusinessServiceImpl.java
...le/order/service/order/impl/OrderBusinessServiceImpl.java
+6
-0
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+6
-6
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java
View file @
b94caa15
...
...
@@ -1455,6 +1455,9 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
orderTimeDO
.
setRemarksZh
(
String
.
format
(
orderAirTimeEnum
.
getRemarksZh
(),
objective
.
getTitleZh
()));
orderTimeDO
.
setRemarksEn
(
String
.
format
(
orderAirTimeEnum
.
getRemarksEn
(),
objective
.
getTitleEn
()));
}
orderMapper
.
update
(
null
,
new
LambdaUpdateWrapper
<
OrderDO
>()
.
set
(
OrderDO:
:
getUnloadTime
,
businessTime
)
.
eq
(
OrderDO:
:
getOrderId
,
orderDO
.
getOrderId
()));
// LogisticsInfoDto logisticsDestInfoDto = warehouseLineMapper.getStartInfoAndDestInfoByLineId(orderDO.getLineId());
// if (Objects.nonNull(logisticsDestInfoDto)) {
// orderTimeDO.setRemarksZh(String.format(orderAirTimeEnum.getRemarksZh(), logisticsDestInfoDto.getDestTitleZh()));
...
...
@@ -1587,6 +1590,9 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
orderTimeDO
.
setRemarksZh
(
String
.
format
(
orderSeaTimeEnum
.
getRemarksZh
(),
objective
.
getTitleZh
()));
orderTimeDO
.
setRemarksEn
(
String
.
format
(
orderSeaTimeEnum
.
getRemarksEn
(),
objective
.
getTitleEn
()));
}
orderMapper
.
update
(
null
,
new
LambdaUpdateWrapper
<
OrderDO
>()
.
set
(
OrderDO:
:
getUnloadTime
,
businessTime
)
.
eq
(
OrderDO:
:
getOrderId
,
orderDO
.
getOrderId
()));
// LogisticsInfoDto logisticsDestInfoDto = warehouseLineMapper.getStartInfoAndDestInfoByLineId(orderDO.getLineId());
// if (Objects.nonNull(logisticsDestInfoDto)) {
// orderTimeDO.setRemarksZh(String.format(orderSeaTimeEnum.getRemarksZh(), logisticsDestInfoDto.getDestTitleZh()));
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @
b94caa15
...
...
@@ -4198,16 +4198,16 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
currentOrderDO
.
setDaogangTime
(
now
);
// }
break
;
case
UNLOADED_CABINET:
//
case UNLOADED_CABINET:
// if (Objects.isNull(currentOrderDO.getUnloadTime())) {
currentOrderDO
.
setUnloadTime
(
now
);
//
currentOrderDO.setUnloadTime(now);
// }
break
;
case
UNLOADED_CABINET_AIR:
//
break;
//
case UNLOADED_CABINET_AIR:
// if (Objects.isNull(currentOrderDO.getUnloadTime())) {
currentOrderDO
.
setUnloadTime
(
now
);
//
currentOrderDO.setUnloadTime(now);
// }
break
;
//
break;
case
PICKED_UP:
// if (Objects.isNull(currentOrderDO.getTakeTime())) {
currentOrderDO
.
setTakeTime
(
now
);
...
...
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