attiya/ebike-plus
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: attiya:e6d2977434f4e9a6ccf872e816434a5db55156af2a2f92e0ce24810c3197ea16
Branches Tags
attiya:main
attiya:dev
..
compare: attiya:0cb459101fbc84193df9e5f98fe0fcd9f77a85dec1f9c1d6f8fbf640b9809431
Branches Tags
attiya:main
attiya:dev

No commits in common. "e6d2977434f4e9a6ccf872e816434a5db55156af2a2f92e0ce24810c3197ea16" and "0cb459101fbc84193df9e5f98fe0fcd9f77a85dec1f9c1d6f8fbf640b9809431" have entirely different histories.
e6d2977434 ... 0cb459101f

3 changed files with 4 additions and 78 deletions
Show Stats Expand all files Collapse all files

4
ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java
View File

@ -117,8 +117,4 @@ public class EbikeBikeOrder implements Serializable {
*/
private String remarks;
/**
* 是否故障误报
*/
private Boolean faultFalseAlarm;
}

77
ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
View File

@ -554,43 +554,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
@Override
public void bikeDispatch(DoneDispatchOrderVo doneDispatchOrderVo) {
String bikeCode = doneDispatchOrderVo.getBikeCode();
QueryWrapper queryWrapper = QueryWrapper.create()
.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeCode))
.where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED)))
.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.DISPATCH));
EbikeBikeOrder bikeOrder = getOne(queryWrapper);
if (bikeOrder == null) {
throw new EbikeException("该工单不存在或已作废");
}
Long receiverId = bikeOrder.getReceiverId();
long loginId = StpUtil.getLoginIdAsLong();
if (receiverId != null) {
if (!receiverId.equals(loginId)) {
throw new EbikeException("该工单已被他人接单");
}
} else {
bikeOrder.setReceiverId(loginId);
}
bikeOrder.setSiteId(doneDispatchOrderVo.getSiteId());
bikeOrder.setHandleState(OrderHandleState.PROCESSED);
List<String> fileUrls = doneDispatchOrderVo.getFileUrls();
List<EbikeOrderFile> list = new ArrayList<>();
if (fileUrls != null && !fileUrls.isEmpty()) {
for (String fileUrl : fileUrls) {
EbikeOrderFile ebikeOrderFile = EbikeOrderFile.builder()
.orderId(bikeOrder.getOrderId())
.fileUrl(fileUrl)
.build();
list.add(ebikeOrderFile);
}
}
if (!list.isEmpty()){
ebikeOrderFileMapper.insertBatch(list);
}
updateById(bikeOrder);
}
@Override
@ -607,13 +571,13 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
Long receiverId = bikeOrder.getReceiverId();
long loginId = StpUtil.getLoginIdAsLong();
if (receiverId != null) {
if (!receiverId.equals(loginId)) {
if (receiverId.equals(loginId)) {
throw new EbikeException("该工单已被他人接单");
}
} else {
bikeOrder.setReceiverId(loginId);
bikeOrder.setHandleState(OrderHandleState.PROCESSED);
}
bikeOrder.setHandleState(OrderHandleState.PROCESSED);
List<String> afterInspectionFileUrls = inspectionVo.getAfterInspectionFileUrls();
List<EbikeOrderFile> list = new ArrayList<>();
@ -637,9 +601,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
list.add(ebikeOrderFile);
}
}
if (!list.isEmpty()){
ebikeOrderFileMapper.insertBatch(list);
}
ebikeOrderFileMapper.insertBatch(list);
updateById(bikeOrder);
}
@ -656,40 +618,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
@Override
public void doFault(DoneFaultOrderVo faultOrderVo) {
String bikeCode = faultOrderVo.getBikeCode();
QueryWrapper queryWrapper = QueryWrapper.create()
.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeCode))
.where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED)))
.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.REPAIR));
EbikeBikeOrder bikeOrder = getOne(queryWrapper);
if (bikeOrder == null) {
throw new EbikeException("该工单不存在或已作废");
}
Long receiverId = bikeOrder.getReceiverId();
long loginId = StpUtil.getLoginIdAsLong();
if (receiverId != null) {
if (!receiverId.equals(loginId)) {
throw new EbikeException("该工单已被他人接单");
}
} else {
bikeOrder.setReceiverId(loginId);
}
bikeOrder.setHandleState(OrderHandleState.PROCESSED);
List<String> fileUrls = faultOrderVo.getFileUrls();
List<EbikeOrderFile> list = new ArrayList<>();
if (fileUrls != null && !fileUrls.isEmpty()) {
for (String fileUrl : fileUrls) {
EbikeOrderFile ebikeOrderFile = EbikeOrderFile.builder()
.orderId(bikeOrder.getOrderId())
.fileUrl(fileUrl)
.build();
list.add(ebikeOrderFile);
}
}
if (!list.isEmpty()){
ebikeOrderFileMapper.insertBatch(list);
}
updateById(bikeOrder);
}
@Override

1
ebike-operations/src/main/resources/mapper/EbikeBikeInfoMapper.xml
View File

@ -31,6 +31,7 @@
#{radius}
)
AND ebike_bike_info.status = 1
-- AND ebike_bike_info.usage_status = 1
ORDER BY distance ASC
</select>
</mapper>