From f8cda1703c37349dbc262b7b75514d0868f73883 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Sat, 11 Jun 2022 10:06:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E5=85=A5DI=E5=90=8C=E6=AD=A5=E4=B8=89?= =?UTF-8?q?=E6=9C=9F=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiContrastController.java | 7 ++- .../controller/inout/utils/InoutUtils.java | 3 +- .../thread/BasicUpdateProductService.java | 2 +- .../com/glxp/api/admin/util/UdiInfoUtil.java | 44 +++++++++++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/util/UdiInfoUtil.java diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java index d330c46a..96fa44c6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java @@ -21,6 +21,7 @@ import com.glxp.api.admin.service.thrsys.ThrProductsService; import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.admin.util.DateUtil; import com.glxp.api.admin.util.GennerOrderUtils; +import com.glxp.api.admin.util.UdiInfoUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; @@ -114,7 +115,7 @@ public class UdiContrastController { for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); } - udiInfoService.insertUdiInfos(udiInfoEntities); + udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); // udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); udiRelevanceEntity.setUpdateTime(DateUtil.formatDateTime(new Date())); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); @@ -293,6 +294,7 @@ public class UdiContrastController { udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); udiInfoEntity.setDiType(1); + udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); udiInfoService.insertUdiInfo(udiInfoEntity); } @@ -354,8 +356,9 @@ public class UdiContrastController { public void insertUdiInfos(List udiInfoEntities) { if (CollUtil.isNotEmpty(udiInfoEntities)) { UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiInfoEntities.get(0).getUuid()); + if (udiInfoEntity == null) { - udiInfoService.insertUdiInfos(udiInfoEntities); + udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); } } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java index a3b32414..228a0da9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java @@ -14,6 +14,7 @@ import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.util.DateUtil; import com.glxp.api.admin.util.FilterUdiUtils; import com.glxp.api.admin.util.GennerOrderUtils; +import com.glxp.api.admin.util.UdiInfoUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -57,7 +58,7 @@ public class InoutUtils { if (udiInfoEntity == null) { List froms = udiDlHttpClient.getUdiByDi(prefix); if (froms != null && !froms.isEmpty()) { - udiInfoService.insertUdiInfos(froms); + udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(froms)); udiInfoEntity = udiInfoService.findByNameCode(prefix); UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java index 2cdedf4f..74698385 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java @@ -224,7 +224,7 @@ public class BasicUpdateProductService { productInfoFilterRequest.setLimit(limit); List udiInfoEntities = getUdiInfoEntity(productInfoFilterRequest); if (udiInfoEntities != null && udiInfoEntities.size() > 0) { - udiInfoService.insertUdiInfos(udiInfoEntities); + udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/UdiInfoUtil.java b/api-admin/src/main/java/com/glxp/api/admin/util/UdiInfoUtil.java new file mode 100644 index 00000000..1122449d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/UdiInfoUtil.java @@ -0,0 +1,44 @@ +package com.glxp.api.admin.util; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; + +import java.util.List; + +public class UdiInfoUtil { + + + public static UdiInfoEntity initUdiInfoEntity(UdiInfoEntity udiInfoEntity) { + if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhph()) && "否".equals(udiInfoEntity.getScbssfbhph())) { + udiInfoEntity.setAllowNoBatch(true); + } + if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhscrq()) && "否".equals(udiInfoEntity.getScbssfbhscrq())) { + udiInfoEntity.setAllowNoProduct(true); + } + if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhsxrq()) && "否".equals(udiInfoEntity.getScbssfbhsxrq())) { + udiInfoEntity.setAllowNoExpire(true); + } + return udiInfoEntity; + } + + public static List initUdiInfoEntitys(List udiInfoEntitys) { + if (CollUtil.isNotEmpty(udiInfoEntitys)) { + for (UdiInfoEntity udiInfoEntity : udiInfoEntitys) { + if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhph()) && "否".equals(udiInfoEntity.getScbssfbhph())) { + udiInfoEntity.setAllowNoBatch(true); + } + if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhscrq()) && "否".equals(udiInfoEntity.getScbssfbhscrq())) { + udiInfoEntity.setAllowNoProduct(true); + } + if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhsxrq()) && "否".equals(udiInfoEntity.getScbssfbhsxrq())) { + udiInfoEntity.setAllowNoExpire(true); + } + } + } + + return udiInfoEntitys; + } + + +}