Skip to content

J
jiedao-api-boot-master
Commit 12c41269 authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

Merge branch 'master-fix' into release

parents 6497a7b4 bb93b5dc
release_bak dev-wealth-fix jd_dev
1 merge request!62Release分支合并到jd分支1227
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ 12c41269
...@@ -5920,6 +5920,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5920,6 +5920,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (Objects.isNull(consigneeDO.getId())){ if (Objects.isNull(consigneeDO.getId())){
consigneeDO.setUpdateTime(consigneeVO.getCreateTime()); consigneeDO.setUpdateTime(consigneeVO.getCreateTime());
consigneeDO.setUpdater(consigneeVO.getCreator()); consigneeDO.setUpdater(consigneeVO.getCreator());
consigneeDO.setOrderId(orderBackVO.getOrderId());
} }
orderConsigneeService.saveOrUpdate(consigneeDO); orderConsigneeService.saveOrUpdate(consigneeDO);
if (orderBackVO.getIsCargoControl()) { if (orderBackVO.getIsCargoControl()) {
......
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