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

代码优化

Browse Source
This commit is contained in:
PC 2026-03-02 16:08:10 +08:00
parent 87271a0693
commit 89d6a9755d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -545,6 +545,7 @@ 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)
@ -571,6 +572,7 @@ 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)
@ -582,17 +584,19 @@ 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)
@ -633,7 +637,8 @@ 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));