1.对接新系统的签收2

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java

@@ -77,9 +77,9 @@ public class DistributionSignforEntity extends TenantEntity {
 	private Long reservationId;
 
 	/**
-	 * 配送编号
+	 * 配送关联id
 	 */
-	@ApiModelProperty(value = "配送编号")
+	@ApiModelProperty(value = "配送关联id")
 	private Long deliveryId;
 	/**
 	 * 收货人(id)

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientUserServiceImpl.java

@@ -132,7 +132,7 @@ public class BasicdataClientUserServiceImpl extends BaseServiceImpl<BasicdataCli
 			queryWrapper.eq("client_id",clientId)
 				.eq("is_deleted",0);
 			List<BasicdataStorageServicesEntity> storageServicesEntityList = basicdataStorageServicesService.list(queryWrapper);
-			if(storageServicesEntityList.size() == 0){
+			if(storageServicesEntityList.isEmpty()){
 				throw new CustomerException(403,"该用户未配置服务仓");
 			}
 			for (BasicdataStorageServicesEntity storageServicesEntity:storageServicesEntityList){

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java

@@ -1,13 +1,20 @@
 package com.logpm.distribution.receiver;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.logpm.distribution.entity.DistributionDeliveryListEntity;
+import com.logpm.distribution.entity.DistributionReservationEntity;
+import com.logpm.distribution.entity.DistributionSignforEntity;
 import com.logpm.distribution.entity.DistributionStockEntity;
+import com.logpm.distribution.mapper.DistributionDeliveryListMapper;
+import com.logpm.distribution.mapper.DistributionReservationMapper;
+import com.logpm.distribution.mapper.DistributionSignforMapper;
 import com.logpm.distribution.service.IDistributionStockService;
 import com.logpm.oldproject.dto.SignPushDataDTO;
 import com.logpm.oldproject.feign.IOldSystemDataPushClient;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -30,19 +37,58 @@ public class ClerkCheckPushDataQueueHandler {
 
 	@Autowired
 	private IDistributionStockService distributionStockService;
-
+	@Autowired
 	private IOldSystemDataPushClient oldSystemDataPushClient;
+	@Autowired
+	private DistributionSignforMapper distributionSignforMapper;
+	@Autowired
+	private DistributionDeliveryListMapper distributionDeliveryListMapper;
+	@Autowired
+	private DistributionReservationMapper distributionReservationMapper;
+
 
 	@RabbitHandler
 	public void clerkCheckPushDataHandler(Map map, Message message, Channel channel) {
 
 		//得到审核的任务ＩＤ
 		Long signfor_id = (Long) map.get("signfor_id");
+		if (ObjectUtil.isEmpty(signfor_id)) {
+			log.info(">>>>>>>>>>>>> clerkCheckPushDataHandler 签收ID为空");
+			return;
+		}
+
+		//得到签收对象
+		DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.selectById(signfor_id);
 
 
+		if (ObjectUtil.isEmpty(distributionSignforEntity)) {
+			log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionSignforEntity {}", distributionSignforEntity);
+			return;
+		}
 		//　得到配送计划
+		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distributionSignforEntity.getDeliveryId());
+		if (ObjectUtil.isEmpty(distributionDeliveryListEntity)) {
+			log.info(">>>>>>>>>>> clerkCheckPushDataHandler distributionDeliveryListEntity {}", distributionDeliveryListEntity);
+			return;
+		}
 
 		// 得到配送客户
+		DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distributionSignforEntity.getReservationId());
+		if (ObjectUtil.isEmpty(distributionReservationEntity)) {
+			log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionReservationEntity {}", distributionReservationEntity);
+			return;
+		}
+
+		//得到客户对应的签收数据
+		// TODO 这里的数据需要查询 等TJJ 空了来帮我写
+
+
+
+
+
+
+
+
 
 		// 得到签收订单数量
 
@@ -50,10 +96,12 @@ public class ClerkCheckPushDataQueueHandler {
 		SignPushDataDTO signPushDataDTO = new SignPushDataDTO();
 
 
-		Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(signPushDataDTO);
 
 
 
 
+		Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(signPushDataDTO);
+
+
 	}
 }

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

@@ -2855,7 +2855,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		//  得到signfor的ID 获取配送计划的的信息 和配送客户的信息
 		map.put("signfor_id",distributionSignfor.getId());
 
-		rabbitTemplate.convertAndSend(RabbitConstant.CLERK_CHECK_PUSH_DATA_EXCHANGE, RabbitConstant.CLERK_CHECK_PUSH_DATA_ROUTING, map, new CorrelationData(String.valueOf(orderStatusLog.getId())));
+		rabbitTemplate.convertAndSend(RabbitConstant.CLERK_CHECK_PUSH_DATA_EXCHANGE, RabbitConstant.CLERK_CHECK_PUSH_DATA_ROUTING, map);
 
 	}