From fb32fd7b6d78ace083059872302eebd1a1c0ab72 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 7 Aug 2024 18:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E5=8F=96=E6=B6=88BU?=
 =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionReservationServiceImpl.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index 5ba35fab7..6fba031a4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -3703,7 +3703,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 								.eq(DistributionReservationPackageEntity::getReservationId, reservationId)
 								.in(DistributionReservationPackageEntity::getStockArticleId, orderIds)
 								.ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())
-								.ne(DistributionReservationPackageEntity::getCancelRemark, "商家端取消")
 							);
 							if (!packageEntityList.isEmpty()) {
 								//进行包件状态恢复
@@ -3717,7 +3716,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 									JSONObject jsonObject = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), distributionReservationPackageEntity.getPacketBarCode(), content, WorkNodeEnums.CANCEL_DELIVERY.getCode());
 									logList.add(jsonObject);
 								}
-
+								List<Long> packageIds = packageEntityList.stream().map(DistributionReservationPackageEntity::getId).collect(Collectors.toList());
+								distributionReservationPackageService.update(Wrappers.<DistributionReservationPackageEntity>update().lambda()
+									.in(DistributionReservationPackageEntity::getId,packageIds)
+									.set(DistributionReservationPackageEntity::getCancelRemark,"商家端取消")
+									.set(DistributionReservationPackageEntity::getPacketBarStatus,ReservationPackageStatusConstant.quxiao.getValue())
+								);
 
 
 							}