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
3a4e0323
Commit
3a4e0323
authored
Aug 30, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加海运封柜时收发货人的首次成交时间
parent
43eb275d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
OrderBusinessServiceImpl.java
...le/order/service/order/impl/OrderBusinessServiceImpl.java
+9
-0
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 @
3a4e0323
...
@@ -28,6 +28,7 @@ import cn.iocoder.yudao.module.depository.dto.LogisticsInfoDto;
...
@@ -28,6 +28,7 @@ import cn.iocoder.yudao.module.depository.dto.LogisticsInfoDto;
import
cn.iocoder.yudao.module.ecw.api.currency.CurrencyApi
;
import
cn.iocoder.yudao.module.ecw.api.currency.CurrencyApi
;
import
cn.iocoder.yudao.module.ecw.api.currency.dto.CurrencyRespDTO
;
import
cn.iocoder.yudao.module.ecw.api.currency.dto.CurrencyRespDTO
;
import
cn.iocoder.yudao.module.ecw.api.currency.dto.ExchangeRateRespDTO
;
import
cn.iocoder.yudao.module.ecw.api.currency.dto.ExchangeRateRespDTO
;
import
cn.iocoder.yudao.module.ecw.api.customer.CustomerApi
;
import
cn.iocoder.yudao.module.ecw.api.unit.UnitApi
;
import
cn.iocoder.yudao.module.ecw.api.unit.UnitApi
;
import
cn.iocoder.yudao.module.ecw.api.unit.dto.UnitRespDto
;
import
cn.iocoder.yudao.module.ecw.api.unit.dto.UnitRespDto
;
import
cn.iocoder.yudao.module.ecw.dal.dataobject.country.CountryDO
;
import
cn.iocoder.yudao.module.ecw.dal.dataobject.country.CountryDO
;
...
@@ -146,6 +147,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
...
@@ -146,6 +147,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
private
final
CurrencyApi
currencyApi
;
private
final
CurrencyApi
currencyApi
;
private
final
OrderQueryService
orderQueryService
;
private
final
OrderQueryService
orderQueryService
;
private
final
UnitApi
unitApi
;
private
final
UnitApi
unitApi
;
private
final
CustomerApi
customerApi
;
private
final
OrderOperateLogService
orderOperateLogService
;
private
final
OrderOperateLogService
orderOperateLogService
;
...
@@ -1584,6 +1586,13 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
...
@@ -1584,6 +1586,13 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
orderTimeDO
.
setMark
(
1
);
// 装柜字体标红
orderTimeDO
.
setMark
(
1
);
// 装柜字体标红
orderTimeDO
.
setRemarksZh
(
String
.
format
(
orderSeaTimeEnum
.
getRemarksZh
(),
Objects
.
nonNull
(
estTime
)
?
DateUtil
.
formatDateTime
(
estTime
)
:
""
));
orderTimeDO
.
setRemarksZh
(
String
.
format
(
orderSeaTimeEnum
.
getRemarksZh
(),
Objects
.
nonNull
(
estTime
)
?
DateUtil
.
formatDateTime
(
estTime
)
:
""
));
orderTimeDO
.
setRemarksEn
(
String
.
format
(
orderSeaTimeEnum
.
getRemarksEn
(),
Objects
.
nonNull
(
estTime
)
?
DateUtil
.
formatDateTime
(
estTime
)
:
""
));
orderTimeDO
.
setRemarksEn
(
String
.
format
(
orderSeaTimeEnum
.
getRemarksEn
(),
Objects
.
nonNull
(
estTime
)
?
DateUtil
.
formatDateTime
(
estTime
)
:
""
));
// 海运装柜动态更新时,需要同步更新订单的收发客户的首次成交状态
OrderConsignorDO
orderConsignorDO
=
orderConsignorService
.
getOrderConsignorByOrderId
(
orderDO
.
getOrderId
());
customerApi
.
fillFirstDealTimeIfNull
(
orderConsignorDO
.
getCustomerId
(),
businessTime
);
OrderConsigneeDO
orderConsigneeDO
=
orderConsigneeService
.
getOrderConsigneeByOrderId
(
orderDO
.
getOrderId
());
if
(
Objects
.
nonNull
(
orderConsigneeDO
))
{
customerApi
.
fillFirstDealTimeIfNull
(
orderConsigneeDO
.
getCustomerId
(),
businessTime
);
}
break
;
break
;
case
SEA_CUSTOMS_PASS_SEA:
case
SEA_CUSTOMS_PASS_SEA:
orderTimeDO
.
setRemarksZh
(
String
.
format
(
orderSeaTimeEnum
.
getRemarksZh
(),
Objects
.
nonNull
(
estTime
)
?
DateUtil
.
formatDateTime
(
estTime
)
:
""
));
orderTimeDO
.
setRemarksZh
(
String
.
format
(
orderSeaTimeEnum
.
getRemarksZh
(),
Objects
.
nonNull
(
estTime
)
?
DateUtil
.
formatDateTime
(
estTime
)
:
""
));
...
...
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