From 4b0a11ae18856dbc5d905f82ade42bddafe91be7 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Tue, 22 Oct 2024 14:44:18 +0800 Subject: [PATCH] =?UTF-8?q?perf(sales):=20=E4=BC=98=E5=8C=96=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=A4=84=E7=90=86=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=B9=B6=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=97=AE=E9=A2=98-=20=E5=B0=86=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86=E7=9A=84=E6=89=B9=E6=AC=A1=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E4=BB=8E=20800=E8=B0=83=E6=95=B4=E4=B8=BA=20200?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E6=8F=90=E9=AB=98=E5=A4=84=E7=90=86=E6=95=88?= =?UTF-8?q?=E7=8E=87=20-=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BB=A3=E7=A0=81=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4=E7=9A=84=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8=20-=20=E6=B3=A8=E9=87=8A=E6=8E=89?= =?UTF-8?q?=E4=BA=86=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=88=86=E6=91=8A=E7=BB=93=E6=9E=9C=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=BB=A5=E5=87=8F=E5=B0=91=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?= =?UTF-8?q?=20-=20=E6=9B=B4=E6=96=B0=E4=BA=86=E6=B5=8B=E8=AF=95=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=96=B0=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BB=A3=E7=A0=81=E8=BF=9B=E8=A1=8C=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/sales/SoSaleOutPluginInitializerToC.java | 12 +++++++----- .../util/OfsOrderAfterSalesAmountAllocationUtil.java | 6 +++--- .../lets/util/OfsOrderSaleAmountAllocationUtil.java | 6 +++--- .../sales/SoSaleOutPluginInitializerToBTest.java | 4 +++- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java index 4f754136..dbef9aa3 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java @@ -615,7 +615,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { } //每50作为一个批次插入主表，根据主键（id）判断是否重复，如果重复的，则不进行插入 - List> ofssaleorderoutsearchList = SplitListByCountUtil.splitListByCount(headerDetailsDtoList1, 800); + List> ofssaleorderoutsearchList = SplitListByCountUtil.splitListByCount(headerDetailsDtoList1, 200); for (int i = 0; i < ofssaleorderoutsearchList.size(); i++) { List headerDtoList = ofssaleorderoutsearchList.get(i); Thread thread = new Thread(new Runnable() { @@ -643,7 +643,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { } //插入明细表 - List> detailsDtoList = SplitListByCountUtil.splitListByCount(headerDetailsDtoList2, 800); + List> detailsDtoList = SplitListByCountUtil.splitListByCount(headerDetailsDtoList2, 200); for (int i = 0; i < detailsDtoList.size(); i++) { List detailsDtos = detailsDtoList.get(i); Thread thread = new Thread(new Runnable() { @@ -2493,9 +2493,11 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { // detailsDto.setHeaderDetailsDto(headerDetailsDto1); // } // } - com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDetailsDto headerDetailsDto1 = stringHeaderDetailsDtoMap.get(refOrderCode); - if (headerDetailsDto1 != null) { - detailsDto.setHeaderDetailsDto(headerDetailsDto1); + if (refOrderCode != null && !"".equals(refOrderCode)) { + com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDetailsDto headerDetailsDto1 = stringHeaderDetailsDtoMap.get(refOrderCode); + if (headerDetailsDto1 != null) { + detailsDto.setHeaderDetailsDto(headerDetailsDto1); + } } } // String targetRefOrderCode = header.getRefOrderCode(); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderAfterSalesAmountAllocationUtil.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderAfterSalesAmountAllocationUtil.java index 16f5157b..e764f627 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderAfterSalesAmountAllocationUtil.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderAfterSalesAmountAllocationUtil.java @@ -46,9 +46,9 @@ public class OfsOrderAfterSalesAmountAllocationUtil { logger.error("batchTocSalesAmountAllocation方法抛出异常，批量处理TOC售后订单分摊异常", e); } }); - logger.info("=记录优惠金额分摊结果开始="); - printAmountOfMoneyNum(rerturnGoodsOrderSearchDataList); - logger.info("=记录优惠金额分摊结果完成="); +// logger.info("=记录优惠金额分摊结果开始="); +// printAmountOfMoneyNum(rerturnGoodsOrderSearchDataList); +// logger.info("=记录优惠金额分摊结果完成="); } /** diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderSaleAmountAllocationUtil.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderSaleAmountAllocationUtil.java index 59a3692f..3536675b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderSaleAmountAllocationUtil.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderSaleAmountAllocationUtil.java @@ -43,9 +43,9 @@ public class OfsOrderSaleAmountAllocationUtil { logger.error("batchTocSalesAmountAllocation方法抛出异常，批量处理TOC销售金额分摊异常", e); } }); - logger.info("=记录优惠金额分摊结果开始="); - printAmountOfMoneyNum(headerDetailsDtoList); - logger.info("=记录优惠金额分摊结果完成="); +// logger.info("=记录优惠金额分摊结果开始="); +// printAmountOfMoneyNum(headerDetailsDtoList); +// logger.info("=记录优惠金额分摊结果完成="); } /** diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java index 4acc1fa4..cfb34f91 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java @@ -79,8 +79,10 @@ public class SoSaleOutPluginInitializerToBTest { // soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024101700000270"); try { - soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024101800025544", "stock"); +// soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024101800025544", "stock"); // soSaleOutPluginInitializerToB.startImplementByTranTime("2024-10-18 14:49:58", "2024-10-18 14:49:59"); + String aaa = "LETS-SH2024101800024795"; + soSaleOutPluginInitializerToB.startImplementByCode(aaa, "stock"); } catch (Exception e) { e.printStackTrace(); }