用户关锁

This commit is contained in:
yanglei 2025-12-18 15:47:00 +08:00
parent 0ba57aab7a
commit c54075d734

View File

@ -25,6 +25,7 @@ import com.ebike.feign.model.dto.FeignEbikeDto;
import com.ebike.feign.model.dto.FeignEbikeUserBikeInfo; import com.ebike.feign.model.dto.FeignEbikeUserBikeInfo;
import com.ebike.feign.model.dto.FeignEbikeUserLockDto; import com.ebike.feign.model.dto.FeignEbikeUserLockDto;
import com.ebike.feign.model.dto.FeignOrderPaymentDto; import com.ebike.feign.model.dto.FeignOrderPaymentDto;
import com.ebike.feign.model.vo.EbikeLockVo;
import com.ebike.feign.model.vo.FeignEbikeBikeRadiusVo; import com.ebike.feign.model.vo.FeignEbikeBikeRadiusVo;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
@ -234,9 +235,12 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
order.setOutOfServiceAreaFee(bikeInfo.getOutOfServiceAreaFee()); order.setOutOfServiceAreaFee(bikeInfo.getOutOfServiceAreaFee());
order.setMaxFeeAmount(bikeInfo.getMaxFeeAmount()); order.setMaxFeeAmount(bikeInfo.getMaxFeeAmount());
// 关锁 // 关锁
JsonResult<FeignEbikeUserLockDto> jsonResult = operationsFeignClient.lock(endDto.getBikeCode()); EbikeLockVo ebikeLockVo = new EbikeLockVo();
ebikeLockVo.setBikeCode(endDto.getBikeCode());
ebikeLockVo.setPoint(endDto.getEndPoint());
JsonResult<FeignEbikeUserLockDto> jsonResult = operationsFeignClient.lock(ebikeLockVo);
if (jsonResult.getCode() != Code.SUCCESS) { if (jsonResult.getCode() != Code.SUCCESS) {
throw new RuntimeException("关锁失败"); throw new EbikeException("关锁失败");
} }
FeignEbikeUserLockDto data = jsonResult.getData(); FeignEbikeUserLockDto data = jsonResult.getData();
// 订单费用计算 // 订单费用计算
@ -466,7 +470,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
.where(EBIKE_ORDER.ORDER_STATUS.eq(OrderStatus.IN_PROGRESS)); .where(EBIKE_ORDER.ORDER_STATUS.eq(OrderStatus.IN_PROGRESS));
EbikeOrder userOrders = ebikeOrderTransactionMapper.selectOneByQuery(queryWrapper); EbikeOrder userOrders = ebikeOrderTransactionMapper.selectOneByQuery(queryWrapper);
if (userOrders == null) { if (userOrders == null) {
throw new RuntimeException("该订单不存在"); throw new EbikeException("该订单不存在");
} }
return userOrders; return userOrders;
} }