From efce84554c4a2f44d4fd927c90b263a5e4e14b7d Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 18 Nov 2024 18:49:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/entity/basic/UdiProductEntity.java | 1 + .../com/glxp/api/service/collect/RelCodeBatchService.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index 94940e66..d17caf90 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -347,6 +347,7 @@ public class UdiProductEntity { */ @TableField(value = "detailSort") private Integer detailSort; + public Integer getMyBhxjsl() { if (bhxjsl == null || bhxjsl == 0) return 1; diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index 7a520182..4c618faa 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -363,7 +363,7 @@ public class RelCodeBatchService extends ServiceImpl ioCodeTempEntities = ioCodeTempDao.selectList(new LambdaQueryWrapper().eq(IoCodeTempEntity::getCode, parentCode)); if (CollUtil.isNotEmpty(ioCodeTempEntities)) { - + IoCodeTempEntity codeTempEntity = ioCodeTempEntities.get(0); //1、排除掉层级是1的 UdiEntity udi = FilterUdiUtils.getUdi(parentCode); if (udi == null) @@ -374,6 +374,10 @@ public class RelCodeBatchService extends ServiceImpl navList = this.list(new LambdaQueryWrapper() .eq(RelCodeBatch::getParentCode, parentCode)); +// codeTempEntity.getSupId() + //todo if(navList)是空的 1.查供应商key;2:根据parentCode查阿里接口;3:根据返回结果,再次查询 + + if ((udiProductEntity != null && "1".equals(udiProductEntity.getPackLevel())) || (CollUtil.isNotEmpty(navList)) ) {