|
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.qmrb.system.converter.ParkingCardConverter;
|
|
|
+import com.qmrb.system.framework.security.util.SecurityUtils;
|
|
|
import com.qmrb.system.mapper.ParkingCardMapper;
|
|
|
import com.qmrb.system.pojo.entity.ParkingCard;
|
|
|
import com.qmrb.system.pojo.entity.ParkingCardType;
|
|
@@ -92,14 +93,14 @@ public class ParkingCardServiceImpl extends ServiceImpl<ParkingCardMapper, Parki
|
|
|
queryWrapper.le(ParkingCard::getEndTime, queryParams.getEndTimeEnd());
|
|
|
}
|
|
|
if (StrUtil.isNotBlank(queryParams.getCreatedAtBegin())) {
|
|
|
- queryWrapper.ge(ParkingCard::getCreatedAt, queryParams.getCreatedAtBegin());
|
|
|
+ queryWrapper.ge(ParkingCard::getCreateTime, queryParams.getCreatedAtBegin());
|
|
|
}
|
|
|
if (StrUtil.isNotBlank(queryParams.getCreatedAtEnd())) {
|
|
|
- queryWrapper.le(ParkingCard::getCreatedAt, queryParams.getCreatedAtEnd());
|
|
|
+ queryWrapper.le(ParkingCard::getCreateTime, queryParams.getCreatedAtEnd());
|
|
|
}
|
|
|
|
|
|
// 默认按创建时间降序排序
|
|
|
- queryWrapper.orderByDesc(ParkingCard::getCreatedAt);
|
|
|
+ queryWrapper.orderByDesc(ParkingCard::getCreateTime);
|
|
|
|
|
|
// 查询数据
|
|
|
Page<ParkingCard> entityPage = this.page(
|
|
@@ -126,6 +127,7 @@ public class ParkingCardServiceImpl extends ServiceImpl<ParkingCardMapper, Parki
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public ParkingCardForm saveForm(ParkingCardForm form) {
|
|
|
+ form.setUserId(SecurityUtils.getUserId());
|
|
|
// 校验月卡类型是否存在
|
|
|
ParkingCardType cardType = parkingCardTypeService.getById(form.getTypeId());
|
|
|
Assert.notNull(cardType, "月卡类型不存在");
|
|
@@ -154,8 +156,8 @@ public class ParkingCardServiceImpl extends ServiceImpl<ParkingCardMapper, Parki
|
|
|
|
|
|
// 设置创建和更新时间
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
- entity.setCreatedAt(now);
|
|
|
- entity.setUpdatedAt(now);
|
|
|
+ entity.setCreateTime(now);
|
|
|
+ entity.setUpdateTime(now);
|
|
|
|
|
|
// 持久化
|
|
|
this.save(entity);
|
|
@@ -201,7 +203,7 @@ public class ParkingCardServiceImpl extends ServiceImpl<ParkingCardMapper, Parki
|
|
|
|
|
|
// 更新实体
|
|
|
converter.updateEntityFromForm(form, entity);
|
|
|
- entity.setUpdatedAt(LocalDateTime.now());
|
|
|
+ entity.setUpdateTime(LocalDateTime.now());
|
|
|
|
|
|
// 保存更新
|
|
|
boolean result = this.updateById(entity);
|
|
@@ -255,7 +257,7 @@ public class ParkingCardServiceImpl extends ServiceImpl<ParkingCardMapper, Parki
|
|
|
|
|
|
// 更新状态
|
|
|
entity.setStatus(status);
|
|
|
- entity.setUpdatedAt(LocalDateTime.now());
|
|
|
+ entity.setUpdateTime(LocalDateTime.now());
|
|
|
|
|
|
// 如果从有效变为过期,减少已使用配额
|
|
|
if ("active".equals(entity.getStatus()) && "expired".equals(status)) {
|