From b547bcf1c70a55b9936bd310ae89b8974e0b8aea Mon Sep 17 00:00:00 2001 From: zhengyf Date: Wed, 27 Nov 2024 17:23:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A1=E3=80=8120241127?= =?UTF-8?q?=EF=BC=9Atoc\tob=E4=BB=85=E9=80=80=E6=AC=BE=E6=B2=A1=E6=9C=89sk?= =?UTF-8?q?u=E7=BC=96=E7=A0=81=E7=9A=84=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/RefundOnlyPluginInitializerToB.java | 24 ++++++++++-------- .../sales/RefundOnlyPluginInitializerToC.java | 25 +++++++++++-------- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java index d9bb37d1..82210848 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java @@ -469,20 +469,24 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { r1.clear(); for (RerturnGoodsOrderSearchDetails logDetail : logDetails) { if(logDetail.getSkuCode()==null||"".equals(logDetail.getSkuCode())) { - IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); - integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N); - integrationTaskLivingDetailsEntity.setRootAppNewData(null); - integrationTaskLivingDetailsEntity.setNewTransmitInfo(logDetail.getReturnOrderCode() + ",没有SKU编码，请检查OFS系统订单"); - integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); - integrationTaskLivingDetailsEntity.setBusinessDate(format); - integrationTaskLivingDetailsEntity.setRootAppPk(logDetail.getReturnOrderCode() + "_" + logDetail.getSkuCode()); - integrationTaskLivingDetailsEntity.setRootAppBill(logDetail.getReturnOrderCode()); - integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); - saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); + continue; +// IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); +// integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N); +// integrationTaskLivingDetailsEntity.setRootAppNewData(null); +// integrationTaskLivingDetailsEntity.setNewTransmitInfo(logDetail.getReturnOrderCode() + ",没有SKU编码，请检查OFS系统订单"); +// integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); +// integrationTaskLivingDetailsEntity.setBusinessDate(format); +// integrationTaskLivingDetailsEntity.setRootAppPk(logDetail.getReturnOrderCode() + "_" + logDetail.getSkuCode()); +// integrationTaskLivingDetailsEntity.setRootAppBill(logDetail.getReturnOrderCode()); +// integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); +// saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); }else { r1.add(logDetail); } } + if(r1.size()==0){ + continue; + } //按sku分组 Map> collectSKU = r1.stream().collect(Collectors.groupingBy(index -> index.getSkuCode())); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java index 60de6ac3..2ca3c111 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java @@ -467,23 +467,28 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { //没有sku编码的报错 + //20241127：没有sku编码的过滤 r1.clear(); for (RerturnGoodsOrderSearchDetails logDetail : logDetails) { if(logDetail.getSkuCode()==null||"".equals(logDetail.getSkuCode())) { - IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); - integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N); - integrationTaskLivingDetailsEntity.setRootAppNewData(null); - integrationTaskLivingDetailsEntity.setNewTransmitInfo(logDetail.getReturnOrderCode() + ",没有SKU编码，请检查OFS系统订单"); - integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); - integrationTaskLivingDetailsEntity.setBusinessDate(format); - integrationTaskLivingDetailsEntity.setRootAppPk(logDetail.getReturnOrderCode() + "_" + logDetail.getSkuCode()); - integrationTaskLivingDetailsEntity.setRootAppBill(logDetail.getReturnOrderCode()); - integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); - saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); + continue; +// IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); +// integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N); +// integrationTaskLivingDetailsEntity.setRootAppNewData(null); +// integrationTaskLivingDetailsEntity.setNewTransmitInfo(logDetail.getReturnOrderCode() + ",没有SKU编码，请检查OFS系统订单"); +// integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); +// integrationTaskLivingDetailsEntity.setBusinessDate(format); +// integrationTaskLivingDetailsEntity.setRootAppPk(logDetail.getReturnOrderCode() + "_" + logDetail.getSkuCode()); +// integrationTaskLivingDetailsEntity.setRootAppBill(logDetail.getReturnOrderCode()); +// integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); +// saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); }else { r1.add(logDetail); } } + if(r1.size()==0){ + continue; + } //按sku分组 Map> collectSKU = r1.stream().collect(Collectors.groupingBy(index -> index.getSkuCode()));