This commit is contained in:
PC 2026-01-27 16:17:01 +08:00
parent ed451798e8
commit 8c829a76ec
3 changed files with 6 additions and 2 deletions

View File

@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 车辆扫一扫详情
@ -48,6 +49,8 @@ public class EbikeScanOrderDto implements Serializable {
*/
private Long orderCode;
private LocalDateTime createdAt;
/**
* 是否自己已接单
*/

View File

@ -589,7 +589,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
EBIKE_BIKE_ORDER.BIKE_CODE,
EBIKE_BIKE_ORDER.ORDER_CODE
)
.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeCode));
.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeCode))
.where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)));
List<EbikeScanOrderDto> list = orderMapper.selectListByQueryAs(queryWrapper, EbikeScanOrderDto.class);
long staffId = StpUtil.getLoginIdAsLong();
if (!list.isEmpty()) {

View File

@ -196,7 +196,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeInfo.getBikeCode()))
.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.DISPATCH))
.where(EBIKE_BIKE_ORDER.DISPATCH_STATE.eq(OrderDispatchState.PROCESSED));
EbikeBikeOrder order = this.mapper.selectOneByQuery(queryWrapper);
EbikeBikeOrder order = this.mapper.selectOneByQuery( queryWrapper);
if (order != null) {
log.error("车辆存在已完成但暂未生效的调度工单,bikeCode={} ", bikeInfo.getBikeCode());
throw new EbikeException("车辆短时间内不能多次调度");