diff --git a/ebike-operations/src/main/java/com/cdzy/operations/config/WechatConfig.java b/ebike-operations/src/main/java/com/cdzy/operations/config/WechatConfig.java new file mode 100644 index 0000000..e57ed87 --- /dev/null +++ b/ebike-operations/src/main/java/com/cdzy/operations/config/WechatConfig.java @@ -0,0 +1,24 @@ +package com.cdzy.operations.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +/** + * @author yanglei + * @since 2025-10-15 09:36 + */ + +@Getter +@Setter +@Configuration +@ConfigurationProperties(prefix = "wechat") +public class WechatConfig { + + /** + * 二维码跳转路径 + */ + private String qrUrl; + +} diff --git a/ebike-operations/src/main/java/com/cdzy/operations/enums/BikeUsageStatus.java b/ebike-operations/src/main/java/com/cdzy/operations/enums/BikeUsageStatus.java index 80387d3..d2ff74c 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/enums/BikeUsageStatus.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/enums/BikeUsageStatus.java @@ -6,11 +6,6 @@ package com.cdzy.operations.enums; */ public interface BikeUsageStatus { - /** - * 未投放 - */ - int BIND = 0; - /** * 待单 */ diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java index 7219bfa..0f4c6e8 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java @@ -228,7 +228,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl list = fileUrls.stream().map(e -> EbikeOrderFile.builder().orderId(orderId).fileUrl(e).build()).toList(); orderFileMapper.insertBatch(list); } - //TODO:车辆状态 + //巡检无需操作车辆状态,巡检确认后更改唱歌了状态为故障 } @Transactional @@ -259,6 +264,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl list = bikeInfoMapper.selectListByQueryAs(queryWrapper, EbikeOrderBikeListDto.class); List snList = list.stream().map(EbikeOrderBikeListDto::getEcuSn).toList(); @@ -587,9 +592,10 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl list = ebikeOrderFileMapper.selectListByQueryAs(queryWrapper,String.class); + + queryWrapper.clear(); + queryWrapper.select(EBIKE_ORDER_PART.ORDER_PART) + .where(EBIKE_ORDER_PART.ORDER_ID.eq( bikeOrder.getOrderId())); + List parts = ebikeOrderPartMapper.selectListByQueryAs(queryWrapper, Integer.class); + + EbikeBikeOrder ebikeBikeOrder = EbikeBikeOrder.builder() + .bikeCode(bikeInfo.getBikeCode()) + .orderCode(snowFlakeIDKeyGenerator.nextId()) + .orderType(BikeOrderType.REPAIR) + .operatorId(bikeInfo.getOperatorId()) + .remarks(inspectionVo.getRemarks()) + .build(); + this.mapper.insert(ebikeBikeOrder); + Long orderId = ebikeBikeOrder.getOrderId(); + if (parts != null && !parts.isEmpty()) { + List partList = parts.stream().map(e -> EbikeOrderPart.builder().orderId(orderId).orderPart(e).build()).toList(); + orderPartMapper.insertBatch(partList); + } + if (list != null && !list.isEmpty()) { + List files = list.stream().map(e -> EbikeOrderFile.builder().orderId(orderId).fileUrl(e).build()).toList(); + orderFileMapper.insertBatch(files); + } + //TODO:车辆状态 + bikeInfo.setUsageStatus(BikeUsageStatus.REPAIR); + bikeInfoMapper.update(bikeInfo); + } + + bikeOrder.setHandleState(OrderHandleState.PROCESSED); List afterInspectionFileUrls = inspectionVo.getAfterInspectionFileUrls(); @@ -637,7 +685,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl implements EbikeBikeQrService{ + @Resource + private WechatConfig wechatConfig; + private static final String bikeUrl = "/bike-qr/"; private static final String bikeSuffix = ".jpg"; @@ -50,7 +54,7 @@ public class EbikeBikeQrServiceImpl extends ServiceImpl