From 4ffb40feb615d9689dd0953897a50e406c083a51 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Fri, 13 Dec 2024 14:37:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(buildpackage):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=97=E8=A1=A8=E5=92=8C=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 BalanceUnitPriceUtil 中添加新的店铺代码 XZJJ - 在 ShopTobOrToCUtil 中注释掉设置 dr 字段的代码 - 更新 SoSaleOutPluginInitializerToCTest 中的测试用例时间 - 调整 SoSaleReturnPluginInitializerToBTest 和 SoSaleReturnPluginInitializerToCTest 中的测试用例代码和时间 --- .../com/hzya/frame/plugin/lets/util/BalanceUnitPriceUtil.java | 1 + .../com/hzya/frame/plugin/lets/util/ShopTobOrToCUtil.java | 2 +- .../lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java | 4 ++-- .../plugin/sales/SoSaleReturnPluginInitializerToBTest.java | 4 ++-- .../plugin/sales/SoSaleReturnPluginInitializerToCTest.java | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/BalanceUnitPriceUtil.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/BalanceUnitPriceUtil.java index 5bc8df72..b052a258 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/BalanceUnitPriceUtil.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/BalanceUnitPriceUtil.java @@ -42,6 +42,7 @@ public class BalanceUnitPriceUtil { cacheShopMap.put("pdd-yanxi", "pdd-yanxi"); cacheShopMap.put("pdd-taoxi", "pdd-taoxi"); cacheShopMap.put("DLTer", "DLTer"); + cacheShopMap.put("XZJJ", "XZJJ"); } /** diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/ShopTobOrToCUtil.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/ShopTobOrToCUtil.java index 99867c37..ea0d480b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/ShopTobOrToCUtil.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/ShopTobOrToCUtil.java @@ -35,7 +35,7 @@ public class ShopTobOrToCUtil { BdDefdocEntity bdDefdocEntity2 = new BdDefdocEntity(); bdDefdocEntity2.setPkDefdoclist(platformZdyId2); - bdDefdocEntity2.setDr(0); +// bdDefdocEntity2.setDr(0); bdDefdocEntity2.setDataSourceCode("lets_u8c"); bdDefdocEntity2.setMemo(memo); List<BdDefdocEntity> bdDefdocEntityList2 = iBdDefdocDao.query(bdDefdocEntity2); diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java index 184f5106..b33a3fa6 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java @@ -110,7 +110,7 @@ class SoSaleOutPluginInitializerToCTest { // soSaleOutPluginInitializerToC.startImplementStockByCode(aaa, "tran"); // String aaa = "LETS-SH2024102800021196"; -// soSaleOutPluginInitializerToC.startImplementTranByTime("2024-11-23 11:24:33", "2024-11-23 11:24:33"); + soSaleOutPluginInitializerToC.startImplementStockByTime("2024-12-06 09:25:39", "2024-12-06 09:25:39"); // soSaleOutPluginInitializerToC.startImplementStockByTime("2024-11-15 00:00:00", "2024-11-15 23:59:59"); } catch (Exception e) { @@ -120,7 +120,7 @@ class SoSaleOutPluginInitializerToCTest { // soSaleOutPluginInitializerToC.sendU8CTOCOrder("123446"); try { - soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024120300016549", "stock"); +// soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024120500018494", "stock"); // soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024110500013375", "tran"); // soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024111700013756", "tran"); diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToBTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToBTest.java index cc1edf56..db88af47 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToBTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToBTest.java @@ -35,9 +35,9 @@ public class SoSaleReturnPluginInitializerToBTest { //测试TOB退货-确认收入 // soSaleReturnPluginInitializerToB.startImplementByTradeTime("2024-08-30 15:54:41", "2024-08-30 15:54:43"); - soSaleReturnPluginInitializerToB.startImplementByCode("LETS-RE2024112200000301", "tran"); +// soSaleReturnPluginInitializerToB.startImplementByCode("LETS-RE2024112200000301", "tran"); -// soSaleReturnPluginInitializerToB.startImplementByStockTime("2024-11-04 00:00:00", "2024-11-04 23:59:59"); + soSaleReturnPluginInitializerToB.startImplementByStockTime("2024-11-29 00:00:00", "2024-11-30 23:59:59"); } catch (Exception e) { e.printStackTrace(); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java index fb1e6e67..ece137a8 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java @@ -30,8 +30,8 @@ public class SoSaleReturnPluginInitializerToCTest { public void startImplement() { // soSaleReturnPluginInitializerToC.startImplement(null, null); try { - String code = "LETS-RE2024112900000001"; - soSaleReturnPluginInitializerToC.startImplementByCode(code, "tran"); + String code = "LETS-RE2024112600000411"; + soSaleReturnPluginInitializerToC.startImplementByCode(code, "stock"); } catch (Exception e) { e.printStackTrace(); }