代码优化

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

@@ -545,6 +545,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                                         QueryWrapper.create()
                                                 .from(EBIKE_BIKE_ORDER)
                                                 .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))
                                 ))
                                 .then(true)
@@ -571,6 +572,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                                         QueryWrapper.create()
                                                 .from(EBIKE_BIKE_ORDER)
                                                 .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))
                                 ))
                                 .then(true)
@@ -582,17 +584,19 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                                         QueryWrapper.create()
                                                 .from(EBIKE_BIKE_ORDER)
                                                 .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))
                                 ))
                                 .then(true)
                                 .else_(false)
                                 .end().as(EbikeOrderBikeListDto::getHasDispatchOrder),
-                        // 判断是否有换电工单
+                        // 判断是否有维修工单
                         QueryMethods.case_()
                                 .when(QueryMethods.exists(
                                         QueryWrapper.create()
                                                 .from(EBIKE_BIKE_ORDER)
                                                 .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))
                                 ))
                                 .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))
                     .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()));
-        } else if (orderType != null) {
+        }
+        if (orderType != null) {
             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.ORDER_TYPE.eq(orderType));

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

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