diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java index 8eb4a133..5e0402bf 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java @@ -392,6 +392,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { // String ofsId = v.get(0).getId(); //日志记录使用 List logDetails = new ArrayList<>(); + List r1 = new ArrayList<>(); try { ArapDjzbVO arapDjzbVO = new ArapDjzbVO(); @@ -451,30 +452,30 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { } logDetails.addAll(ofsDetails); - List children = new ArrayList<>(); - Iterator iterator = logDetails.iterator(); - while (iterator.hasNext()) { - RerturnGoodsOrderSearchDetails logDetail = iterator.next(); - if(logDetail.getSkuCode()==null||"".equals(logDetail.getSkuCode())){ + //没有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.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); - // 删除当前的 logDetail 对象 - iterator.remove(); + }else { + r1.add(logDetail); } } //按sku分组 - Map> collectSKU = ofsDetails.stream().collect(Collectors.groupingBy(index -> index.getSkuCode())); + Map> collectSKU = r1.stream().collect(Collectors.groupingBy(index -> index.getSkuCode())); + List children = new ArrayList<>(); Set>> entries = collectSKU.entrySet(); for (Map.Entry> entry : entries) { children.clear(); @@ -615,7 +616,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { ErrMessage = "推送U8C,丽知:售后订单(仅退款)--->U8C红字应收单最外层失败,失败原因:" + e.getMessage(); } //失败 批量新增 ofsDetails - for (RerturnGoodsOrderSearchDetails logDetail : logDetails) { + for (RerturnGoodsOrderSearchDetails logDetail : r1) { IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N); integrationTaskLivingDetailsEntity.setRootAppNewData(mapStr);