From 51b5ae5d13fa0b1adbd880769715411bcb5586da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com> Date: Sat, 13 Dec 2025 23:06:31 +0800 Subject: [PATCH] =?UTF-8?q?12.13=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/userAggregate/repository/po/UserDriverPo.java | 6 ++++++ .../src/main/resources/mapper/UserDriverMapper.xml | 4 +++- .../service/vehicle/VehicleApplicationService.java | 8 ++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java index e2ea6d6d5..8456359f0 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java @@ -231,4 +231,10 @@ public class UserDriverPo extends BaseVOEntity { @ApiModelProperty(name = "用户身份") private Integer userIdentity; + + @ApiModelProperty(name = "经营许可证") + private String driverBusinessLicenseFrontUrl; + + @ApiModelProperty(name = "经营许可证号") + private String driverBusinessLicenseNumber; } diff --git a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml index 59b9303ce..3b438e315 100644 --- a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml @@ -302,11 +302,13 @@ ude.driver_corp_legal_name, ude.driver_corp_name, ude.driver_corp_idcard_number, + ude.driver_business_license_front_url, + ude.driver_business_license_number, WM_CONCAT(dvb.vehicle_license_plate_number) AS vehicleLicensePlateNumber, WM_CONCAT(m.motorcade_name) AS driverTeamName, md.motorcade_id motorcade_header_id FROM "USER" b - LEFT JOIN user_driver a ON a.user_id = b.user_id AND b.del_flag = 1 + LEFT JOIN user_driver a ON a.user_id = b.user_id AND a.del_flag = 1 LEFT JOIN user_driver_enterprise ude ON a.user_id = ude.user_id AND ude.del_flag = 1 LEFT JOIN driver_vehicle_bind dvb ON a.user_id = dvb.user_id AND dvb.del_flag = 1 LEFT JOIN motorcade m ON a.driver_id = m.motorcade_header_id AND m.del_flag = 1 diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java b/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java index 1cc12f451..934ed4034 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java @@ -405,9 +405,7 @@ public class VehicleApplicationService { throw new ServiceException("车牌号不能为空"); } - if (! Pattern.matches(Constants.LICENSE_PLATE_REGEX, vehicleLicensePlateNumber)) { - throw new ServiceException("车牌号格式不正确"); - } + // Removed license plate regex validation as per requirement VehicleDto query = new VehicleDto(); query.setVehicleLicensePlateNumber(vehicle.getVehicleLicensePlateNumber()); @@ -680,9 +678,7 @@ public class VehicleApplicationService { if (StrUtil.isEmpty(vehicleLicensePlateNumber)) { throw new ServiceException("车牌号不能为空"); } - if (! Pattern.matches(Constants.LICENSE_PLATE_REGEX, vehicleLicensePlateNumber)) { - throw new ServiceException("车牌号格式不正确"); - } + // Removed license plate regex validation as per requirement VehicleDto query = new VehicleDto(); query.setVehicleLicensePlateNumber(vehicle.getVehicleLicensePlateNumber());