From e50b4ff7edbaeed43c53ee6db49b4c0dac9b57d2 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 14 Dec 2023 14:40:51 +0800 Subject: [PATCH] =?UTF-8?q?update=20vin=E5=90=AF=E5=8A=A8=E5=85=85?= =?UTF-8?q?=E7=94=B5=20=E6=9C=89=E8=BD=A6=E7=89=8C=E5=8F=B7=E6=97=B6?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=BD=A6=E7=89=8C=E5=8F=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/OrderBasicInfoServiceImpl.java | 8 ++++++-- .../programlogic/DelayMerchantProgramLogic.java | 10 +++++++++- .../programlogic/NotDelayMerchantProgramLogic.java | 10 +++++++++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index d5f575807..324ac3daa 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -3475,8 +3475,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // vin启动 MemberPlateNumberRelation memberPlateNumberRelation = dto.getMemberPlateNumberRelation(); if (memberPlateNumberRelation != null) { - orderBasicInfo.setVinCode(memberPlateNumberRelation.getVinCode()); - orderBasicInfo.setPlateNumber(memberPlateNumberRelation.getPhoneNumber()); + if (StringUtils.isNotBlank(memberPlateNumberRelation.getVinCode())) { + orderBasicInfo.setVinCode(memberPlateNumberRelation.getVinCode()); + } + if (StringUtils.isNotBlank(memberPlateNumberRelation.getLicensePlateNumber())) { + orderBasicInfo.setPlateNumber(memberPlateNumberRelation.getLicensePlateNumber()); + } } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index 6135d861f..044bd2a57 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -138,7 +138,15 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { } if (StringUtils.equals(dto.getStartMode(), StartModeEnum.VIN_CODE.getValue())) { // vin启动 - orderBasicInfo.setVinCode(dto.getMemberPlateNumberRelation().getVinCode()); + MemberPlateNumberRelation memberPlateNumberRelation = dto.getMemberPlateNumberRelation(); + if (memberPlateNumberRelation != null) { + if (StringUtils.isNotBlank(memberPlateNumberRelation.getVinCode())) { + orderBasicInfo.setVinCode(memberPlateNumberRelation.getVinCode()); + } + if (StringUtils.isNotBlank(memberPlateNumberRelation.getLicensePlateNumber())) { + orderBasicInfo.setPlateNumber(memberPlateNumberRelation.getLicensePlateNumber()); + } + } } if (StringUtils.equals(dto.getStartType(), StartTypeEnum.APPOINTMENT.getValue())) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java index 796e23c33..01f094102 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java @@ -139,7 +139,15 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { } if (StringUtils.equals(dto.getStartMode(), StartModeEnum.VIN_CODE.getValue())) { // vin启动 - orderBasicInfo.setVinCode(dto.getMemberPlateNumberRelation().getVinCode()); + MemberPlateNumberRelation memberPlateNumberRelation = dto.getMemberPlateNumberRelation(); + if (memberPlateNumberRelation != null) { + if (StringUtils.isNotBlank(memberPlateNumberRelation.getVinCode())) { + orderBasicInfo.setVinCode(memberPlateNumberRelation.getVinCode()); + } + if (StringUtils.isNotBlank(memberPlateNumberRelation.getLicensePlateNumber())) { + orderBasicInfo.setPlateNumber(memberPlateNumberRelation.getLicensePlateNumber()); + } + } } if (StringUtils.equals(dto.getStartType(), StartTypeEnum.APPOINTMENT.getValue())) {