fix: 1.修改商家数据推送的判定

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

@@ -59,7 +59,7 @@ public class BusinessPreOrderDataQueueHandler {
 
 		if(tenant1.isSuccess() && tenant1.getData() != null ){
 			Tenant data = tenant1.getData();
-			if(1==data.getTenantType()){
+			if(2==data.getTenantType()){
 				log.info(">>>>>>>>> 当前作业对象 {} 未 商家对象",data.getTenantName() );
 				return ;
 			}

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

@@ -852,10 +852,13 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 							stockArticleEntity.setDescriptionGoods(incomeCategoryName);
 
 							BasicdataClientEntity clientEntity = basicdataClientClient.findByName(consigneeName1);
+							// 如果在入库的时候发现客户信息不存在，则不设置客户信息 默认采用商配
 							if (!Objects.isNull(clientEntity)) {
 								stockArticleEntity.setMallId(clientEntity.getId());
 								stockArticleEntity.setMallName(clientEntity.getClientName());
 								stockArticleEntity.setMallCode(clientEntity.getClientCode());
+
+								stockArticleEntity.setTypeService(clientEntity.getTypeService()+"");
 							}
 							String consignee = waybillEntity.getConsignee();
 							String consigneeName = waybillEntity.getConsigneeName();
@@ -866,10 +869,10 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 							stockArticleEntity.setConsigneeMobile(consigneeMobile);
 							stockArticleEntity.setConsigneeAddress(consigneeAddress);
 
-							BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntity.getId(), 3);
-							if (!Objects.isNull(basicdataStoreBusinessEntity)) {
-								stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
-							}
+//							BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientEntity.getId(), 3);
+//							if (!Objects.isNull(basicdataStoreBusinessEntity)) {
+//								stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+//							}
 						}
 					} else {
 						Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, advanceEntity.getBrand());