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

Compare commits

base: attiya:89d6a9755d5df455c06e6ec8ca67c4466eea7bc3d7f2d424d43b540187e3ff7c
Branches Tags
attiya:main
attiya:dev
..
compare: attiya:e902630c8a2b42c528855c4f316f40c5a59a1c5fc23c577bc3f9328818ad6e03
Branches Tags
attiya:main
attiya:dev

No commits in common. "89d6a9755d5df455c06e6ec8ca67c4466eea7bc3d7f2d424d43b540187e3ff7c" and "e902630c8a2b42c528855c4f316f40c5a59a1c5fc23c577bc3f9328818ad6e03" have entirely different histories.
89d6a9755d ... e902630c8a

2 changed files with 4 additions and 7 deletions
Show Stats Expand all files Collapse all files

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

@ -545,7 +545,6 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
QueryWrapper.create() QueryWrapper.create()
.from(EBIKE_BIKE_ORDER) .from(EBIKE_BIKE_ORDER)
.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE)) .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
.and(EBIKE_BIKE_ORDER.HANDLE_STATE.in(OrderHandleState.UNPROCESSED, OrderHandleState.ACCEPTED))
.and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.INSPECTION)) .and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.INSPECTION))
)) ))
.then(true) .then(true)
@ -572,7 +571,6 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
QueryWrapper.create() QueryWrapper.create()
.from(EBIKE_BIKE_ORDER) .from(EBIKE_BIKE_ORDER)
.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE)) .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
.and(EBIKE_BIKE_ORDER.HANDLE_STATE.in(OrderHandleState.UNPROCESSED, OrderHandleState.ACCEPTED))
.and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.BATTERY_SWAP)) .and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.BATTERY_SWAP))
)) ))
.then(true) .then(true)
@ -584,19 +582,17 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
QueryWrapper.create() QueryWrapper.create()
.from(EBIKE_BIKE_ORDER) .from(EBIKE_BIKE_ORDER)
.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE)) .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
.and(EBIKE_BIKE_ORDER.HANDLE_STATE.in(OrderHandleState.UNPROCESSED, OrderHandleState.ACCEPTED))
.and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.DISPATCH)) .and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.DISPATCH))
)) ))
.then(true) .then(true)
.else_(false) .else_(false)
.end().as(EbikeOrderBikeListDto::getHasDispatchOrder), .end().as(EbikeOrderBikeListDto::getHasDispatchOrder),
// 判断是否有维修工单 // 判断是否有换电工单
QueryMethods.case_() QueryMethods.case_()
.when(QueryMethods.exists( .when(QueryMethods.exists(
QueryWrapper.create() QueryWrapper.create()
.from(EBIKE_BIKE_ORDER) .from(EBIKE_BIKE_ORDER)
.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE)) .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
.and(EBIKE_BIKE_ORDER.HANDLE_STATE.in(OrderHandleState.UNPROCESSED, OrderHandleState.ACCEPTED))
.and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.REPAIR)) .and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.REPAIR))
)) ))
.then(true) .then(true)
@ -637,8 +633,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
queryWrapper.leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE)) queryWrapper.leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
.where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED))) .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)))
.where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(StpUtil.getLoginIdAsLong())); .where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(StpUtil.getLoginIdAsLong()));
} } else if (orderType != null) {
if (orderType != null) {
queryWrapper.leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE)) queryWrapper.leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
.where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED))) .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)))
.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType)); .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType));

2
ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeQrServiceImpl.java
View File

@ -61,11 +61,13 @@ public class EbikeBikeQrServiceImpl extends ServiceImpl<EbikeBikeQrMapper, Ebike
.bikeQrCode(code) .bikeQrCode(code)
.bikeQr(minioUtil.getShowUrl(bikeUrl+code +bikeSuffix)) .bikeQr(minioUtil.getShowUrl(bikeUrl+code +bikeSuffix))
.createdBy(StpUtil.getLoginIdAsLong()) .createdBy(StpUtil.getLoginIdAsLong())
.createdBy(320131029184712704L)
.status(BikeQrStatus.UN_BIND) .status(BikeQrStatus.UN_BIND)
.build(); .build();
qrList.add(ebikeBikeQr); qrList.add(ebikeBikeQr);
} }
minioUtil.batchUploadFiles(streamList,names); minioUtil.batchUploadFiles(streamList,names);
saveBatch(qrList); saveBatch(qrList);
} }
} }