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

Compare commits

base: attiya:d8b8275ab2101e8ee833577287d37e90bc82ac1a3aae92368b0a5ef4e645b8d1
Branches Tags
attiya:main
attiya:dev
..
compare: attiya:6dbec55d47f8a6a04f85fd3e745c9257d507b92129fd2b7062503954b9a190b7
Branches Tags
attiya:main
attiya:dev

No commits in common. "d8b8275ab2101e8ee833577287d37e90bc82ac1a3aae92368b0a5ef4e645b8d1" and "6dbec55d47f8a6a04f85fd3e745c9257d507b92129fd2b7062503954b9a190b7" have entirely different histories.
d8b8275ab2 ... 6dbec55d47

1 changed files with 19 additions and 17 deletions
Show Stats Expand all files Collapse all files

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

@ -622,7 +622,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
.where(EBIKE_BIKE_INFO.STATUS.eq(BikeStatus.LAUNCH)) .where(EBIKE_BIKE_INFO.STATUS.eq(BikeStatus.LAUNCH))
.where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode, StringUtil.hasText(bikeCode))) .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode, StringUtil.hasText(bikeCode)))
.where(EBIKE_BIKE_INFO.USAGE_STATUS.eq(bikeStatus, Objects.nonNull(bikeStatus))) .where(EBIKE_BIKE_INFO.USAGE_STATUS.eq(bikeStatus, Objects.nonNull(bikeStatus)))
.leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID)); .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID))
.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)));
if (acceptOrder!=null && acceptOrder){ if (acceptOrder!=null && acceptOrder){
queryWrapper.where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(StpUtil.getLoginIdAsLong())); queryWrapper.where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(StpUtil.getLoginIdAsLong()));
} else if (orderType!=null) { } else if (orderType!=null) {