From efce84554c4a2f44d4fd927c90b263a5e4e14b7d Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 18 Nov 2024 18:49:07 +0800 Subject: [PATCH 1/2] =?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)) ) { From a970e840be448a0c8193fc29c507e8460574ee20 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Mon, 18 Nov 2024 19:43:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9F=A5=E5=88=B0=E7=A0=81?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E6=95=B0=E6=8D=AE=E5=8E=BB?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E9=98=BF=E9=87=8C=E6=8E=A5=E5=8F=A3=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=8F=92=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/collect/RelCodeBatchService.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) 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 4c618faa..ae2616e1 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -32,6 +32,7 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.ProductInfoService; import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.util.HttpClient; +import com.glxp.api.util.alihealth.AlihealthUtils; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -59,7 +60,8 @@ public class RelCodeBatchService extends ServiceImpl() + .eq(RelCodeBatch::getParentCode, parentCode)); + }else { + log.error(baseResponse.getMessage()); + } + } if ((udiProductEntity != null && "1".equals(udiProductEntity.getPackLevel())) || (CollUtil.isNotEmpty(navList))