diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java index bd87f0778..33a32b5db 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java @@ -159,22 +159,22 @@ public class LeaseApplicationService { throw new ServiceException("同一货主租赁信息时间不能重叠"); } setWarehouseInfo(leaseDO); - Boolean insert = leaseDomainService.insert(leaseDO); - if (insert) { + Lease insert = leaseDomainService.insertReturn(leaseDO); + if (insert != null) { ScheduledTask scheduledTask = new ScheduledTask(); scheduledTask.setTaskType("shipperLeaseDetails"); scheduledTask.setTaskStatus("PENDING"); - scheduledTask.setBusId(leaseDO.getId()); + scheduledTask.setBusId(insert.getId()); scheduledTask.setTaskData(JSON.toJSONString(scheduledTask)); scheduledTask.setCreateTime(new Date()); - scheduledTask.setBillDays(leaseDO.getBillDays()); - scheduledTask.setBillTime(leaseDO.getBillTime()); + scheduledTask.setBillDays(insert.getBillDays()); + scheduledTask.setBillTime(insert.getBillTime()); scheduledTask.setRetryCount(0); scheduledTask.setExecuteTime(DateUtil.beginOfDay(DateUtil.tomorrow())); scheduledTask.setDelFlag(1); scheduledTaskMapper.insert(scheduledTask); } - return insert; + return insert != null && insert.getId() != null; } private void setWarehouseInfo(LeaseDO leaseDO) { diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/facade/ILeaseService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/facade/ILeaseService.java index a7de83151..5a03773a2 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/facade/ILeaseService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/facade/ILeaseService.java @@ -25,6 +25,8 @@ public interface ILeaseService extends IService */ public Boolean insert(LeaseDO leaseDO); + public Lease insertReturn(LeaseDO leaseDO); + /** * 修改租赁管理 */ @@ -40,4 +42,4 @@ public interface ILeaseService extends IService * 查询租赁管理 */ public LeasePO getInfo(Long leaseId); -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/persistence/LeaseImpl.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/persistence/LeaseImpl.java index 208ba54a7..1e65008e2 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/persistence/LeaseImpl.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/persistence/LeaseImpl.java @@ -48,6 +48,18 @@ public class LeaseImpl extends ServiceImpl implements ILease return this.save(lease); } + @Override + public Lease insertReturn(LeaseDO leaseDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + Lease lease = new Lease(); + BeanUtils.copyProperties(leaseDO,lease); + boolean save = this.save(lease); + if (save) { + return lease; + } + return lease; + } + /** * 修改容器管理 */ @@ -111,4 +123,4 @@ public class LeaseImpl extends ServiceImpl implements ILease // throw new ServiceException("容器编码【" + containerDO.getContainerCode() + "】已存在"); // } // } -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/service/LeaseDomainService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/service/LeaseDomainService.java index 20c5cff06..82ade3d75 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/service/LeaseDomainService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/service/LeaseDomainService.java @@ -46,6 +46,11 @@ public class LeaseDomainService { return leaseService.insert(leaseDO); } + public Lease insertReturn(LeaseDO leaseDO) { + + return leaseService.insertReturn(leaseDO); + } + /** * 修改租赁管理 */ @@ -84,4 +89,4 @@ public class LeaseDomainService { .in(Lease::getId, leaseIds) .eq(Lease::getDelFlag, 1)); } -} +} \ No newline at end of file