Merge pull request 'fix(service): 修改志邦在途节点地址为仓库名称' (#16) from dev into pre-production

Reviewed-on: #16

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

@@ -1539,7 +1539,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	@Transactional(rollbackFor = Exception.class)
 	@Async
 	public void sendReviewFactory(Long signingId, String warehouseName, Long warehouseId) {
-		String brands = "梦天,欧派";//可追加 ,志邦
+		String brands = "梦天,欧派,志邦";//可追加
 		log.info(">>>>>>>>>>> 签收推送 对象 {}", "signingId：=" + signingId + "warehouseName：=" + warehouseName + "warehouseId：=" + warehouseId);
 		//查询签收信息
 		DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.selectById(signingId);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -380,7 +380,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(nowWarehouseId);
 			String warehouseAddress = null;
 			if (ObjectUtil.isNotEmpty(warehouseEntity)) {
-				warehouseAddress = warehouseEntity.getWarehouseAddress();
+				warehouseAddress = warehouseEntity.getName();
 			}
 			sendFactoryData(brands, node, warehouseAddress);
 		} catch (Exception e) {
@@ -942,7 +942,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(nowWarehouseId);
 			String warehouseAddress = null;
 			if (ObjectUtil.isNotEmpty(warehouseEntity)) {
-				warehouseAddress = warehouseEntity.getWarehouseAddress();
+				warehouseAddress = warehouseEntity.getName();
 			}
 			sendFactoryData(brands, node, warehouseAddress);
 		} catch (Exception e) {
@@ -1709,7 +1709,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(nowWarehouseId);
 			String warehouseAddress = null;
 			if (ObjectUtil.isNotEmpty(warehouseEntity)) {
-				warehouseAddress = warehouseEntity.getWarehouseAddress();
+				warehouseAddress = warehouseEntity.getName();
 			}
 			this.sendFactoryData(brands, NodeEnums.TRIPARTITE_TRANSFER_DEPART, warehouseAddress);
 		} catch (Exception e) {