diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/HttpCodeEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/HttpCodeEnum.java index f2059d6..2ef52f2 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/HttpCodeEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/HttpCodeEnum.java @@ -10,6 +10,8 @@ import lombok.Getter; public enum HttpCodeEnum { // 成功 SUCCESS(200, "操作成功"), + + LEASE_END_TIME_ERROR(500, "需求截止日期不可小于当天,请修改后重新提交"), //失败 FAIL(400, "操作失败,请联系管理员"), // 登录 diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java index 272561b..97e86cc 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.material.lease.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.PhoneUtil; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.bonus.common.biz.constant.MaterialConstants; import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.common.biz.enums.HttpCodeEnum; @@ -85,16 +86,21 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { Long userId = SecurityUtils.getUserId(); maLeaseInfo.setUpdateBy(String.valueOf(userId)); maLeaseInfo.setUpdateTime(DateUtils.getNowDate()); - maLeaseInfo.setLeaseStatus(LeaseInfoEnum.LEASE_PENDING_ORDER.getStatus()); - maLeaseInfo.setStartTime(DateUtils.getNowDate()); - maLeaseInfo.setPublishUser(String.valueOf(userId)); + if (maLeaseInfo.getIsSubmit() != null && maLeaseInfo.getIsSubmit()) { + maLeaseInfo.setLeaseStatus(LeaseInfoEnum.LEASE_PENDING_ORDER.getStatus()); + maLeaseInfo.setStartTime(DateUtils.getNowDate()); + maLeaseInfo.setPublishUser(String.valueOf(userId)); + if (maLeaseInfo.getEndTime() != null && maLeaseInfo.getEndTime().before(new Date())) { + return AjaxResult.error(HttpCodeEnum.LEASE_END_TIME_ERROR.getCode(), HttpCodeEnum.LEASE_END_TIME_ERROR.getMsg()); + } + } int result = leaseInfoMapper.updateDevInfo(maLeaseInfo); //首先根据id查询文件信息是否存在 BmFileInfo bmFileInfo = new BmFileInfo(); bmFileInfo.setModelId(Long.valueOf(maLeaseInfo.getId())); bmFileInfo.setTaskType(MaterialConstants.LEASE_FILE_TYPE_CODE); List bmFileInfoList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); - if (bmFileInfoList.size() > 0) { + if (CollectionUtils.isNotEmpty(bmFileInfoList)) { bmFileInfoMapper.deleteBmFileInfoByIds(bmFileInfoList.stream().map(BmFileInfo::getId).toArray(Long[]::new)); } //插入文件信息 @@ -239,8 +245,7 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { @Override public List rentList(MaLeaseDto dto) { dto.setOrderUser(String.valueOf(SecurityUtils.getUserId())); - List list = leaseInfoMapper.rentList(dto); - return null; + return leaseInfoMapper.rentList(dto); } /**