From 19323cfb075c55f81a25c9bc487d1f7198190287 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 20 Feb 2025 15:18:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E5=93=81=E7=B1=BBbug=202.=E6=8F=90=E8=B4=A7=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=AE=8C=E6=88=90=E6=9B=B4=E6=96=B0=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OpenOrderServiceImpl.java    | 20 ++++++++++++++++++-
 .../impl/TrunklineBillladingServiceImpl.java  |  2 ++
 2 files changed, 21 insertions(+), 1 deletion(-)

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 64d985274..f15a017b2 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
@@ -5614,7 +5614,23 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				WarehouseWayBillDetail warehouseWayBillDetail = new WarehouseWayBillDetail();
 				warehouseWayBillDetail.setWaybillNo(waybillEntity.getWaybillNo());
 				warehouseWayBillDetail.setWaybillId(waybillEntity.getId());
-				warehouseWayBillDetail.setProductId(waybillDetailDTO.getGoodsId());
+
+				Long goodsId = waybillDetailDTO.getGoodsId();
+
+				if (Objects.isNull(goodsId)) {
+					//如果品名id没有就先通过goodsName查寻，没有就新增
+					BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName);
+					if (Objects.isNull(basicdataCategoryEntity)) {
+						basicdataCategoryEntity = new BasicdataCategoryEntity();
+						basicdataCategoryEntity.setName(goodsName);
+						basicdataCategoryEntity.setType("1");
+						goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity);
+					} else {
+						goodsId = basicdataCategoryEntity.getId();
+					}
+				}
+
+				warehouseWayBillDetail.setProductId(goodsId);
 				warehouseWayBillDetail.setProductName(waybillDetailDTO.getGoodsName());
 				warehouseWayBillDetail.setChargeType(waybillDetailDTO.getChargeType());
 				warehouseWayBillDetail.setNum(waybillDetailDTO.getNum());
@@ -5622,6 +5638,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				warehouseWayBillDetail.setWeight(waybillDetailDTO.getWeight());
 				warehouseWayBillDetail.setPrice(waybillDetailDTO.getPrice());
 				warehouseWayBillDetail.setSubtotalFreight(waybillDetailDTO.getSubtotalFreight());
+				warehouseWayBillDetail.setDeliveryPrice(waybillDetailDTO.getDeliveryPrice());
+				warehouseWayBillDetail.setSubtotalDeliveryFee(waybillDetailDTO.getSubtotalDeliveryFee());
 				warehouseWayBillDetail.setPickupPrice(waybillDetailDTO.getPickupPrice());
 				warehouseWayBillDetail.setFreightPrice(waybillDetailDTO.getFreightPrice());
 				warehouseWayBillDetail.setSystemChargeType(waybillDetailDTO.getChargeType());
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java
index 2fe057f50..2575daaa2 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java
@@ -435,6 +435,8 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 						updateEntity.setBillladingStatus(billladingEntity.getBillladingStatus());
 						updateEntity.setEndTime(billladingEntity.getEndTime());
 						stringBuffer.append(",提货中变更为提货完成");
+						billladingWaybillService.updateBillladingFeeByBillladingId(billladingEntity);
+
 					} else {
 						log.warn("##################updateBillladingStatus: 提货单不能更新为已完成 billladingStatus={}", billladingStatus);
 						throw new CustomerException(405, "提货单不能更新为已完成");