xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/order/XpOrder.java
@@ -231,4 +231,6 @@ // 用于计数 @TableField(exist = false) private Integer num; @ApiModelProperty(value = "是否改价标识 0-否 1-是") private Boolean changeMoneyFlag; } xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceServiceImpl.java
@@ -427,7 +427,7 @@ res.add(updatedArea.getAreaName()); res.add(existingArea.getAreaName()); throw new ServiceException( "运营区域{}与现有运营区域{}发生重叠", "运营区域{}与现有运营区域{}发生重叠，请编辑已有的运营区域", I18nKeyConstant.AREA_OVERLAP_ERROR, res.toArray() ); @@ -824,15 +824,6 @@ xpPointMapper.update(updatePoint, updateWrapper); log.info("围栏运营时间缩短停用点位完成 fenceId={}, disableCount={}", dto.getId(), disablePointIdList.size()); } } } //如果区域状态从停用改为启用，需将区域内的点位全部启用 if (status == 3 && dto.getStatus() == 2 && !xpPoints.isEmpty()){ for (XpPoint xpPoint : xpPoints) { xpPoint.setOperationStatus(2); xpPoint.setFpElectronicAreaId(null); xpPointMapper.updateById(xpPoint); } } return R.ok(); xp-robotaxi-map-boot/src/main/resources/i18n/messages.properties
@@ -7,7 +7,7 @@ welcome.message=欢迎来到我们的应用程序！ edit.electronic.error=编辑电子围栏失败; add.electronic.error=添加电子围栏失败; area.overlap.error=运营区域{0}与现有运营区域{1}发生重叠; area.overlap.error=运营区域{0}与现有运营区域{1}发生重叠，请编辑已有的运营区域; fence.structure.not.exist=围栏构成不存在 fence.not.exist=围栏不存在 fence.status.cannot.copied=围栏启用状态不可复制; xp-robotaxi-map-boot/src/main/resources/i18n/messages_en_US.properties
@@ -7,7 +7,7 @@ welcome.message=Welcome to our application! edit.electronic.error=Failed to edit the electronic fence add.electronic.error=Failed to add electronic fence; area.overlap.error=The operational area {0} overlaps with the existing operational area {1}; area.overlap.error=The operational area {0} overlaps with the existing operational area {1}，Please edit the existing operation area fence.structure.not.exist=The fence composition does not exist\ fence.status.cannot.copied=The enabled state of the fence cannot be copied; fence.not.exist=The fence does not exist. xp-robotaxi-map-boot/src/main/resources/i18n/messages_zh_CN.properties
@@ -7,7 +7,7 @@ welcome.message=欢迎来到我们的应用程序！ edit.electronic.error=编辑电子围栏失败; add.electronic.error=添加电子围栏失败; area.overlap.error=运营区域{0}与现有运营区域{1}发生重叠; area.overlap.error=运营区域{0}与现有运营区域{1}发生重叠，请编辑已有的运营区域; fence.structure.not.exist=围栏构成不存在 fence.not.exist=围栏不存在 fence.status.cannot.copied=围栏启用状态不可复制 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -2801,6 +2801,7 @@ boolean updated = this.lambdaUpdate() .set(XpOrder::getOrderMoney, amount) .set(XpOrder::getChangeMoneyFlag, Boolean.TRUE) .eq(XpOrder::getId, id) .eq(XpOrder::getStatus, pendingPaymentStatus) .update();
