From f90d6db61bf9eb57b21adfee6437987f86e92022 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Fri, 14 Mar 2025 19:37:28 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sales):=20=E9=87=8D=E6=9E=84=E8=A2=AB?= =?UTF-8?q?=E5=8A=A8=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改类名：将 SoSaleReturnPluginInitializerToC 改为 PassiveWarehouseReceiptToC - 移除未使用的 pushScenarioType 参数 - 修正 QueryOfsSoSaleOutVo 中的字段名：code 改为 receiptCode - 删除未使用的 REFERENCE_SHOP_LIST 中的空格- 更新相关测试用例 --- .../lets/constant/ProfilesActiveConstant.java | 2 +- .../plugin/lets/ofsvo/QueryOfsSoSaleOutVo.java | 2 ++ .../plugin/sales/PassiveWarehouseReceiptToC.java | 16 ++++++++-------- .../sales/PassiveWarehouseReceiptToCTest.java | 4 +++- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/ProfilesActiveConstant.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/ProfilesActiveConstant.java index f3926521..2a5ee670 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/ProfilesActiveConstant.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/ProfilesActiveConstant.java @@ -49,5 +49,5 @@ public class ProfilesActiveConstant { //2:o->中台->u8c public static final String PUSH_SCENE_TYPE_2 = "2"; //toc/tob仅退款使用，需要去存货管理档案参考售价的店铺 - public static final List REFERENCE_SHOP_LIST = Arrays.asList("DLTer", "XZJJ", "FANG-Q-L-NEW", "pdd-yanxi-new", "FANG-Q-L", "pdd-yanxi"); + public static final List REFERENCE_SHOP_LIST = Arrays.asList("DLTer", "XZJJ", "FANG-Q-L-NEW", "pdd-yanxi-new", "FANG-Q-L", "pdd-yanxi"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofsvo/QueryOfsSoSaleOutVo.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofsvo/QueryOfsSoSaleOutVo.java index 041d51d3..de020318 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofsvo/QueryOfsSoSaleOutVo.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofsvo/QueryOfsSoSaleOutVo.java @@ -64,4 +64,6 @@ public class QueryOfsSoSaleOutVo { private String relatedAt_start; //无源入库确认单关联时间-结束 private String relatedAt_end; + //无源入库单号 + private String receiptCode; } \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java index 97c1e7a2..c175dfcf 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java @@ -144,7 +144,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity { @Override public String getPluginId() { - return "sales.SoSaleReturnPluginInitializerToC"; + return "sales.PassiveWarehouseReceiptToC"; } @Override @@ -177,7 +177,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity { try { String param = String.valueOf(requestJson.get("param")); String sceneType = String.valueOf(requestJson.get("sceneType"));//sceneType：stock、tran - String pushScenarioType = String.valueOf(requestJson.get("pushScenarioType")); +// String pushScenarioType = String.valueOf(requestJson.get("pushScenarioType")); if (ProfilesActiveConstant.TYPE_VBILLCODE.equals(requestJson.get("type"))) { //按单号 if (param != null && !"".equals(param)) { @@ -187,7 +187,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity { //前台页面功能日期推送，或者接口调用也行 String craeteDateStr = computingTime(param); if (craeteDateStr != null && !"".equals(craeteDateStr)) { - splitDateAndPush(craeteDateStr, sceneType, pushScenarioType); + splitDateAndPush(craeteDateStr, sceneType); } } else { if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(PROD_FILED)) { @@ -291,7 +291,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity { List passiveStorageResponseDataList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); - queryOfsSoSaleOutVo.setCode(code); + queryOfsSoSaleOutVo.setReceiptCode(code); queryOfsSoSaleOutVo.setClientCode("LETS"); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(50L); @@ -1689,7 +1689,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity { passiveStorageSonDetailsDto.setCalculateAccountsReceivable(totalAmount); passiveStorageSonDetailsDto.setCalculationFormula(calculationFormulaStr.toString()); - + // if ("6973391732529".equals(passiveStorageSonDetailsDto.getSkuCode())) { // ofsOrderDetail.setPlatformDiscounts("1.02"); // ofsOrderDetail.setMerchantDiscounts("4.88"); @@ -2530,7 +2530,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity { * * @author liuyang */ - public void splitDateAndPush(String param, String sceneType, String pushScenarioType) throws Exception { + public void splitDateAndPush(String param, String sceneType) throws Exception { try { Assert.notNull(param, "param不能为空!"); Assert.state(!"".equals(param), "param不能为空！"); @@ -2538,8 +2538,8 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity { Assert.notNull(sceneType, "sceneType不能为空！"); Assert.state(!"".equals(sceneType), "sceneType不能为空！"); - Assert.notNull(pushScenarioType, "pushScenarioType不能为空！"); - Assert.state(!"".equals(pushScenarioType), "pushScenarioType不能为空！"); +// Assert.notNull(pushScenarioType, "pushScenarioType不能为空！"); +// Assert.state(!"".equals(pushScenarioType), "pushScenarioType不能为空！"); if (param.contains("*")) { String[] params = param.split("\\*"); diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToCTest.java index a5359ec9..d7126c87 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToCTest.java @@ -30,7 +30,9 @@ public class PassiveWarehouseReceiptToCTest { //测试O无源件入库 // passiveWarehouseReceiptToC.startImplementStockByTime("2025-03-11 22:27:02", "2025-03-11 22:27:02"); //测试O无源生成红字应收 - passiveWarehouseReceiptToC.startImplementByTradeTime("2025-03-11 22:27:02", "2025-03-11 22:27:02"); +// passiveWarehouseReceiptToC.startImplementByTradeTime("2025-03-11 22:27:02", "2025-03-11 22:27:02"); + + passiveWarehouseReceiptToC.startImplementByCode("1111", "stock"); } catch (Exception e) { e.printStackTrace(); }