From ce01275289cb2223b64d8f3d9656d7a4327a6cce Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 20 Dec 2024 10:47:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OpenOrderServiceImpl.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 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 9c4c20da0..6e0cdd48b 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 @@ -2961,17 +2961,17 @@ public class OpenOrderServiceImpl implements IOpenOrderService { // 得到改单之前的收货单位 oldConsignee = waybillEntity.getConsignee(); - Long newConsigneeId = openOrderDTO.getConsigneeId(); - - if(Objects.isNull(newConsigneeId)){ - if(waybillType == 1){ - log.warn("#############updateWaybill: 运单收货单位id为空 waybillId={} newConsigneeId={}", waybillId,newConsigneeId); - return R.fail(405, "请先维护收货单位信息"); - }else if(waybillType == 2){ - newConsigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2"); - openOrderDTO.setConsigneeId(newConsigneeId); - } - } +// Long newConsigneeId = openOrderDTO.getConsigneeId(); +// +// if(Objects.isNull(newConsigneeId)){ +// if(waybillType == 1){ +// log.warn("#############updateWaybill: 运单收货单位id为空 waybillId={} newConsigneeId={}", waybillId,newConsigneeId); +// return R.fail(405, "请先维护收货单位信息"); +// }else if(waybillType == 2){ +// newConsigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2"); +// openOrderDTO.setConsigneeId(newConsigneeId); +// } +// } String updateMsg = verifyUpdateData(openOrderDTO, waybillEntity);