商家端取消BUG修复

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())
+								);
 
 
 							}