From 53fa3d897f8194ed6c0f94d6e57a4ebbb0052f4a Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 5 Jun 2024 11:37:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BC=80=E5=8D=95=E9=BB=98=E8=AE=A4=E9=80=81?= =?UTF-8?q?=E8=B4=A7=E6=96=B9=E5=BC=8F=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OpenOrderServiceImpl.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index efe3b3885..dec6fd472 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -182,16 +182,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService { areaId = badeRegionAreaId; } - openOrderVO.setDefaultDeliveryWay("2"); - Integer typeService = basicdataClientEntity.getTypeService(); - if (typeService == 1){ - openOrderVO.setDefaultDeliveryWay("2"); - }else if(typeService == 2){ - openOrderVO.setDefaultDeliveryWay("3"); - }else if(typeService == 3){ - openOrderVO.setDefaultDeliveryWay("1"); - } - openOrderVO.setDeparture(name); openOrderVO.setDepartureCode(areaId); openOrderVO.setDepartureArray(departureArray); @@ -233,6 +223,17 @@ public class OpenOrderServiceImpl implements IOpenOrderService { areaId = badeRegionAreaId; } + + openOrderVO.setDefaultDeliveryWay("2"); + Integer typeService = basicdataClientEntity.getTypeService(); + if (typeService == 1){ + openOrderVO.setDefaultDeliveryWay("2"); + }else if(typeService == 2){ + openOrderVO.setDefaultDeliveryWay("3"); + }else if(typeService == 3){ + openOrderVO.setDefaultDeliveryWay("1"); + } + openOrderVO.setDestination(name); openOrderVO.setDestinationCode(areaId); openOrderVO.setDestinationArray(destinationArray);