From 6ff4c033d3871be4f2fc7bbae05ad3e2ad52bfdb Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Wed, 26 Jul 2023 19:55:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=B8=89=E6=96=B9=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=BD=95=E5=85=A5=E5=95=86=E5=9F=8EID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/BasicdataTripartiteMallEntity.java |  2 +-
 .../impl/BasicdataClientServiceImpl.java      |  2 +-
 .../factory/receiver/DealWithDataHandler.java | 32 +++++++++----------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTripartiteMallEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTripartiteMallEntity.java
index 12a582c68..6dc800918 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTripartiteMallEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTripartiteMallEntity.java
@@ -65,7 +65,7 @@ public class BasicdataTripartiteMallEntity extends TenantEntity {
 	 * 客户ID
 	 */
 	@ApiModelProperty(value = "客户ID")
-	private String client;
+	private Long clientId;
 	/**
 	 * 三方商城
 	 */
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
index 3800cf339..7e9288510 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
@@ -182,7 +182,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 			if (StringUtils.isNotBlank(basicdataClient.getTripartiteMall())) {
 				BasicdataTripartiteMallEntity basicdataTripartiteMall = new BasicdataTripartiteMallEntity();
 				basicdataTripartiteMall.setTripartiteMall(basicdataClient.getTripartiteMall());
-				basicdataTripartiteMall.setClient(basicdataClient.getId().toString());
+				basicdataTripartiteMall.setClientId(basicdataClient.getId());
 				basicdataTripartiteMallService.save(basicdataTripartiteMall);
 
 			}
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java
index 3fe3897c3..3d4710799 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java
@@ -37,39 +37,37 @@ public class DealWithDataHandler {
 
 	@RabbitHandler
 	public void dealWithDataHandler(Map map, Message message, Channel channel) throws IOException {
-		 // 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉
+		// 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉
 		final long deliveryTag = message.getMessageProperties().getDeliveryTag();
 		log.info("##################dealWithDataHandler: 处理在库订单数据到新系统");
 		OrderStatusDTO orderStatusDTO = (OrderStatusDTO) map.get("messageData");
 		String status = orderStatusDTO.getStatus();
 		String unitNo = orderStatusDTO.getUnitNo();
 		String operationTime = orderStatusDTO.getOperationTime();
-		if("4".equals(status)){
+		if ("4".equals(status)) {
 			//继续判断是否到达目的仓
 			String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id
 			//查询destinationWarehouse logiBillNo plantId数据
-			Map<String,String> supplyData = advanceDetailClient.getSupplyData(unitNo);
+			Map<String, String> supplyData = advanceDetailClient.getSupplyData(unitNo);
 			String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id
-			if(StringUtil.isBlank(currentWarehouseId)||StringUtil.isBlank(destinationWarehouseId)){
-				log.warn("##############dealWithDataHandler: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}",currentWarehouseId,destinationWarehouseId);
-				throw new CustomerException(405,"仓库数据有误");
-			}else{
-				if(!currentWarehouseId.equals(destinationWarehouseId)){
-					log.info("##############dealWithDataHandler: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}",currentWarehouseId,destinationWarehouseId);
+			if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) {
+				log.warn("##############dealWithDataHandler: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
+				throw new CustomerException(405, "仓库数据有误");
+			} else {
+				if (!currentWarehouseId.equals(destinationWarehouseId)) {
+					log.info("##############dealWithDataHandler: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
 //					channel.basicAck(deliveryTag,false);
-				}else{
+				} else {
 					//真正的处理需要的数据
-					try{
-						panFactoryDataService.handleDataToPlatform(unitNo,operationTime);
-					}catch (Exception e){
+					try {
+						panFactoryDataService.handleDataToPlatform(unitNo, operationTime);
+					} catch (Exception e) {
 						e.printStackTrace();
 					}
 				}
 			}
-
-		}else{
-			log.info("##############dealWithDataHandler: 不用处理的状态 status={}",status);
-//			channel.basicAck(deliveryTag,false);
+		} else {
+			log.info("##############dealWithDataHandler: 不用处理的状态 status={}", status);
 		}
 	}
 }