1.增加三方商城品牌

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

@@ -129,7 +129,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 						stringList.add(i.getId());
 					}
 				});
-				if (stringList.size() > 0) {
+				if (!stringList.isEmpty()) {
 					basicdataStoreBusinessService.deleteLogic(stringList);
 				}
 
@@ -151,8 +151,8 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 			basicdataClient.setLinkman(null);
 			basicdataClient.setPhone(null);
 			basicdataClient.setCargoControl(false);
-			if (StringUtils.isBlank(basicdataClient.getPid())) {
-				basicdataClient.setPid("0");
+			if (ObjectUtils.isNull(basicdataClient.getPid())) {
+				basicdataClient.setPid(0L);
 			}
 			//添加
 			this.save(basicdataClient);
@@ -312,7 +312,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 				//查询是不是重复
 				List<BasicdataClientEntity> basicdataClientEntities = baseMapper.selectList(Wrappers.<BasicdataClientEntity>query().lambda().eq(BasicdataClientEntity::getClientCode, i.getClientCode()));
 				if(basicdataClientEntities.isEmpty()){
-					basicdataClient.setPid("0");
+					basicdataClient.setPid(0L);
 					basicdataClient.setCargoControl(false);
 					basicdataClient.setStatus(0);
 					basicdataClient.setIsDeleted(0);

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpOldReceivingDataHandler.java

@@ -10,7 +10,6 @@ import com.logpm.basicdata.feign.IBasicdataTripartiteWarehouseClient;
 import com.logpm.factory.oupai.entity.FactoryPackageEntity;
 import com.logpm.factory.oupai.service.IFactoryPackageService;
 import com.logpm.factory.pan.service.IPanFactoryDataService;
-import com.logpm.factory.props.OldSystemProperties;
 import com.logpm.oldproject.entity.WarehouseEntity;
 import com.logpm.oldproject.feign.IOldSystemDataPushClient;
 import com.logpm.oldproject.feign.IWarehouseClient;