bms2相关修改;

This commit is contained in:
王奎兴
2026-03-18 19:46:52 +08:00
parent e42b8d0ba9
commit d2f309af6b
4 changed files with 28 additions and 9 deletions
@@ -159,22 +159,22 @@ public class LeaseApplicationService {
throw new ServiceException("同一货主租赁信息时间不能重叠"); throw new ServiceException("同一货主租赁信息时间不能重叠");
} }
setWarehouseInfo(leaseDO); setWarehouseInfo(leaseDO);
Boolean insert = leaseDomainService.insert(leaseDO); Lease insert = leaseDomainService.insertReturn(leaseDO);
if (insert) { if (insert != null) {
ScheduledTask scheduledTask = new ScheduledTask(); ScheduledTask scheduledTask = new ScheduledTask();
scheduledTask.setTaskType("shipperLeaseDetails"); scheduledTask.setTaskType("shipperLeaseDetails");
scheduledTask.setTaskStatus("PENDING"); scheduledTask.setTaskStatus("PENDING");
scheduledTask.setBusId(leaseDO.getId()); scheduledTask.setBusId(insert.getId());
scheduledTask.setTaskData(JSON.toJSONString(scheduledTask)); scheduledTask.setTaskData(JSON.toJSONString(scheduledTask));
scheduledTask.setCreateTime(new Date()); scheduledTask.setCreateTime(new Date());
scheduledTask.setBillDays(leaseDO.getBillDays()); scheduledTask.setBillDays(insert.getBillDays());
scheduledTask.setBillTime(leaseDO.getBillTime()); scheduledTask.setBillTime(insert.getBillTime());
scheduledTask.setRetryCount(0); scheduledTask.setRetryCount(0);
scheduledTask.setExecuteTime(DateUtil.beginOfDay(DateUtil.tomorrow())); scheduledTask.setExecuteTime(DateUtil.beginOfDay(DateUtil.tomorrow()));
scheduledTask.setDelFlag(1); scheduledTask.setDelFlag(1);
scheduledTaskMapper.insert(scheduledTask); scheduledTaskMapper.insert(scheduledTask);
} }
return insert; return insert != null && insert.getId() != null;
} }
private void setWarehouseInfo(LeaseDO leaseDO) { private void setWarehouseInfo(LeaseDO leaseDO) {
@@ -25,6 +25,8 @@ public interface ILeaseService extends IService<Lease>
*/ */
public Boolean insert(LeaseDO leaseDO); public Boolean insert(LeaseDO leaseDO);
public Lease insertReturn(LeaseDO leaseDO);
/** /**
* 修改租赁管理 * 修改租赁管理
*/ */
@@ -48,6 +48,18 @@ public class LeaseImpl extends ServiceImpl<LeaseMapper, Lease> implements ILease
return this.save(lease); 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;
}
/** /**
* 修改容器管理 * 修改容器管理
*/ */
@@ -46,6 +46,11 @@ public class LeaseDomainService {
return leaseService.insert(leaseDO); return leaseService.insert(leaseDO);
} }
public Lease insertReturn(LeaseDO leaseDO) {
return leaseService.insertReturn(leaseDO);
}
/** /**
* 修改租赁管理 * 修改租赁管理
*/ */