推送老系统外协修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java

@@ -161,7 +161,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	public Boolean getSelfPickup(Long id) {
 		DistributionParcelListEntity entity = new DistributionParcelListEntity();
 		entity.setId(id);
-		entity.setOrderPackageStatus(OrderStatusConstant.bufenqianshou.getValue());
+		entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
 		return distributionParcelListService.updateById(entity);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -6519,6 +6519,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 
 			//还需要配送的出库人、配送人、操作人信息
+			R<User> userR = userClient.userInfoById(delivery.getAdministratorsId());
 			if (Func.isNotEmpty(delivery)) {
 				if ("1".equals(delivery.getKind())) {
 					//自主配送
@@ -6537,13 +6538,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					if (Func.isNotEmpty(distributionDeliveryTripartiteEntity)) {
 						delivery.setOutName(distributionDeliveryTripartiteEntity.getDriverName());
 						delivery.setOutPhone(distributionDeliveryTripartiteEntity.getDriverPhone());
+
 					}
 				}
-				R<User> userR = userClient.userInfoById(delivery.getAdministratorsId());
 				if (Func.isNotEmpty(userR)) {
 					User user = userR.getData();
 					delivery.setAdministratorsName(user.getName());
 					delivery.setAdministratorsPhone(user.getPhone());
+
 				}
 				DistributionStockupEntity distributionStockupEntity = distributionReservationMapper.selectStockup(distributionSignforEntity.getReservationId());
 				if (Func.isNotEmpty(distributionStockupEntity)) {
@@ -6556,6 +6558,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 				//查询客户信息
 				List<SignPushDataContactDTO> customer = distributionReservationMapper.selectPushOldCustomer(distributionSignforEntity.getReservationId());
+				if (customer.size()>1){
+					resultMap.put("result", false);
+					resultMap.put("msg", "存在多个signfor信息 >>>ReservationId():"+distributionSignforEntity.getReservationId());
+				}
 				if (Func.isNotEmpty(customer)) {
 					//查询客户订单
 					List<SignPushDataUnitDTO> signPushDataUnitDTOS = new ArrayList<>();
@@ -6607,6 +6613,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					buildReservationNameAndPhone(customer);
 					//完成客户信息添加
 					delivery.setSignPushDataContactDTOs(customer);
+					if (Objects.isNull(delivery.getOutPhone())){
+						Long signUserId = customer.get(0).getSignUserId();
+						R<User> signforUser = userClient.userInfoById(signUserId);
+						if (Objects.equals(signforUser.getCode() , 200)){
+							delivery.setOutPhone(signforUser.getData().getPhone());
+						}else {
+							resultMap.put("result", false);
+							resultMap.put("msg", "外协查询签收人电话失败:"+customer.get(0).getSignUserId());
+						}
+					}
 				}
 			}