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:
yanglei 2025-11-12 13:33:58 +08:00
parent 65fdc87447
commit cb685a5fe4
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java
View File

@ -4,7 +4,6 @@ import com.cdzy.common.model.response.JsonResult;
import com.cdzy.user.model.dto.EbikeUserCyclingDto;
import com.cdzy.user.model.dto.EbikeUserCyclingEndDto;
import com.cdzy.user.model.entity.EbikeOrder;
import com.cdzy.user.model.vo.EbikeOrderVo;
import com.cdzy.user.service.EbikeOrderService;
import com.ebike.feign.model.dto.FeignEbikeDto;
import com.ebike.feign.model.dto.FeignEbikeUserBikeInfo;

38
ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderImpl.java
View File

@ -81,29 +81,27 @@ public class EbikeOrderImpl extends ServiceImpl<EbikeOrderMapper, EbikeOrder> im
.orderType(OrderType.ONCE)
.startLocation(orderDto.getStartPoint())
.startTime(LocalDateTime.now())
.orderStatus(OrderStatus.IN_PROGRESS)
.createTime(LocalDateTime.now())
.build();
save(order);
return order;
// try {
// // 尝试开锁
// EbikeUnlockResultDto unlockResult = attemptUnlockWithValidation(bikeCode, userId);
// if (!unlockResult.isSuccess()) {
// throw new EbikeException("开锁失败: " + unlockResult.getErrorMsg());
// }
// // 开锁成功
// EbikeOrder orders = EbikeOrder.builder()
// .orderId(order.getOrderId())
// .orderStatus(OrderStatus.IN_PROGRESS)
// .updateTime(LocalDateTime.now())
// .build();
// updateById(orders);
// return orders;
// } catch (Exception e) {
// log.error("开锁失败, userId={}, bikeCode={}", userId, bikeCode, e);
// throw new RuntimeException("开锁失败", e);
// }
try {
// 尝试开锁
EbikeUnlockResultDto unlockResult = attemptUnlockWithValidation(bikeCode, userId);
if (!unlockResult.isSuccess()) {
throw new EbikeException("开锁失败: " + unlockResult.getErrorMsg());
}
// 开锁成功
EbikeOrder orders = EbikeOrder.builder()
.orderId(order.getOrderId())
.orderStatus(OrderStatus.IN_PROGRESS)
.updateTime(LocalDateTime.now())
.build();
updateById(orders);
return orders;
} catch (Exception e) {
log.error("开锁失败, userId={}, bikeCode={}", userId, bikeCode, e);
throw new RuntimeException("开锁失败", e);
}
}