From 5ed7b6aa0ac41d2001df1c1c64a3d215bb801ae3 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Wed, 2 Aug 2023 19:52:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E9=85=8D=E8=AE=A1=E5=88=92=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=9B=9E=E6=98=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/DistributionDeliveryListEntity.java         | 10 +++++-----
 .../mapper/DistributionReservationPackageMapper.xml    |  3 +--
 .../mapper/DistributionStockArticleMapper.xml          |  2 +-
 .../impl/DistributionDeliveryListServiceImpl.java      |  2 +-
 .../impl/DistributionReservationServiceImpl.java       |  4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
index a4ecfb54b..dcb064837 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
@@ -247,11 +247,11 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	@ApiModelProperty(value = "定位打卡地址")
 	private String positioningAdr;
 
-	/**
-	 * 定位打卡地址
-	 */
-	@ApiModelProperty(value = "定位打卡地址")
-	private String deliveryState;
+//	/**
+//	 * 定位打卡地址
+//	 */
+//	@ApiModelProperty(value = "定位打卡地址")
+//	private String deliveryState;
 
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
index 278d19e61..4c52b2002 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
@@ -111,8 +111,7 @@
             ldpl.material_code,
             ldpl.material_unit,
             ldpl.brand_id,
-            ldpl.brand_name,
-            ldpl.delivery_state
+            ldpl.brand_name
         FROM
              ( SELECT reservation_id FROM logpm_distribution_signfor
              <where>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 560bbf5a4..18efff24c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -124,7 +124,7 @@
             ldsa.customer_telephone,
             ldsa.customer_address,
             ldsa.genre,
-            ldsa.state,
+            ldsa.order_status,
             ldsa.notification,
             ldsa.fee,
             ldsa.rate,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index bd6af8c4a..31dd0a119 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -1303,7 +1303,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								//订单发生修改包件的操作，先对该预约下的订单进行解绑
 								Integer i = distributionReservationPackageMapper.deletePackageByRidAndSid(reservationEntity.getId(),o.getId());
 								//构建新的
-								if (o.getPackageList().size()==0){
+								if (!Func.isEmpty(o.getPackageList())){
 									//订单全选
 									LambdaQueryWrapper<DistributionParcelListEntity> qw = new QueryWrapper<DistributionParcelListEntity>().lambda().eq(DistributionParcelListEntity::getStockArticleId, o.getId());
 									List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.getBaseMapper().selectList(qw);
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 d4b9996eb..b35930da8 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
@@ -221,7 +221,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				//预约订单数量
 				AtomicInteger packageNum = new AtomicInteger();
 				List<DistributionParcelListEntity> packageList = s.getPackageList();
-				if (packageList.size() == 0) {
+				if (Func.isEmpty(packageList)) {
 						Map<String, Object> map = new HashMap<>();
 						map.put("stockArticleId", s.getId());
 						QueryWrapper<DistributionParcelListEntity> qw = Condition.getQueryWrapper(map, DistributionParcelListEntity.class);
@@ -1019,7 +1019,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 //			tripartiteEntity.setReservationIds(reservationIds);
 			tripartiteEntity.setDeliveryId(distributionDeliveryListEntity.getId());
 			distributionDeliveryTripartiteService.save(tripartiteEntity);
-			distributionDeliveryListEntity.setKind(ServiceConstant.DELIVERLIST_KIND_TRIPARTITE);
+			distributionDeliveryListEntity.setKind(ServiceConstant.DELIVERLIST_KIND_SELF);
 			distributionDeliveryListEntity.setDriverName(tripartiteEntity.getDriverName());
 			distributionDeliveryListEntity.setVehicleName(tripartiteEntity.getVehicleNum());
 			distributionDeliveryListEntity.setDistributionCompany(tripartite.getDistributionCompany());