From b976728253dc430c69716c2ffab86cdac948c5af Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Thu, 5 Dec 2024 18:44:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sales):=20=E6=9A=82=E5=AD=98=20U8C=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 SoSaleOutPluginInitializerToC 和 SoSaleReturnPluginInitializerToC 类中 - 注释掉处理 U8C 接口返回值的代码 - 使用"暂存"作为销售订单编号和主键值 - 更新状态为"S"，表示暂存状态 - 保留原有的日志记录和异常处理逻辑 --- .../sales/SoSaleOutPluginInitializerToC.java | 74 +++++++++++-------- .../SoSaleReturnPluginInitializerToC.java | 57 ++++++++------ 2 files changed, 76 insertions(+), 55 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 af972b72..f8ce2c80 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 @@ -1201,23 +1201,27 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { List saleorderRequestDtoList = new ArrayList<>(); saleorderRequestDtoList.add(saleorderRequestDto); - Map> stringStringMap = new HashMap<>(); - stringStringMap.put("saleorder", saleorderRequestDtoList); - SoSaleResultRootDto soSaleResultRootDto = sendU8CTOCOrder(JSON.toJSONString(stringStringMap)); +// Map> stringStringMap = new HashMap<>(); +// stringStringMap.put("saleorder", saleorderRequestDtoList); +// SoSaleResultRootDto soSaleResultRootDto = sendU8CTOCOrder(JSON.toJSONString(stringStringMap)); String vreceiptcode = null; - String pk_corp = null; +// String pk_corp = null; String csaleid = null; - if (soSaleResultRootDto != null && soSaleResultRootDto.getParentvo() != null) { - vreceiptcode = soSaleResultRootDto.getParentvo().getVreceiptcode(); - pk_corp = soSaleResultRootDto.getParentvo().getPk_corp(); - csaleid = soSaleResultRootDto.getParentvo().getCsaleid(); - } - logger.info("TOC出库-销售订单编号：{} 主键：{} 销售公司：{}", vreceiptcode, csaleid, pk_corp); +// if (soSaleResultRootDto != null && soSaleResultRootDto.getParentvo() != null) { +// vreceiptcode = soSaleResultRootDto.getParentvo().getVreceiptcode(); +// pk_corp = soSaleResultRootDto.getParentvo().getPk_corp(); +// csaleid = soSaleResultRootDto.getParentvo().getCsaleid(); +// } +// logger.info("TOC出库-销售订单编号：{} 主键：{} 销售公司：{}", vreceiptcode, csaleid, pk_corp); //记录成功 //日志推送的详情，两种方法，是推送U8C成功之后记录，还是整理推送完毕后再记录？ //护童项目之前是整体推送之前记录，后来抛出链接失效的异常，而且只有程序执行完毕后，才能体现结果，执行过程中无法发现结果 //所以还是需要等待U8C接口推送成功之后，马上发生信息的记录，时间下来这样足够稳定，同步速度上没有大的问题 - updateSuccessOrFail1(oldValue, "Y", "success", vreceiptcode, csaleid); + //TODO 测试解决方案 + vreceiptcode = "暂存"; + csaleid = "暂存"; + updateSuccessOrFail1(oldValue, "S", "暂存", vreceiptcode, csaleid); +// updateSuccessOrFail1(oldValue, "Y", "success", vreceiptcode, csaleid); } catch (Exception e) { logger.error("TOC业务转换成U8C对象过程中、或者单据推送到U8C出现异常！", e); //记录失败 @@ -2379,18 +2383,22 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { String vreceiptcode = null; String pk_corp = null; String csaleid = null; - if (soSaleResultRootDto != null && soSaleResultRootDto.getParentvo() != null) { - SoSaleResultHeadDto parentvo = soSaleResultRootDto.getParentvo(); - vreceiptcode = parentvo.getVreceiptcode(); - pk_corp = parentvo.getPk_corp(); - csaleid = parentvo.getCsaleid(); - } else { - logger.error("第一阶段推送，令人匪夷所思的错误，正常来说是不可能执行到这里的，sendU8CTOCOrder方法的错误会向上抛出! json：{}", JSON.toJSON(soSaleResultRootDto)); - } - logger.info("第一阶段：负数销售订单->(自动生成) 负数销售出库单抛出成功，销售订单编号：{} 销售订单主键：{} 销售公司：{}", vreceiptcode, csaleid, pk_corp); +// if (soSaleResultRootDto != null && soSaleResultRootDto.getParentvo() != null) { +// SoSaleResultHeadDto parentvo = soSaleResultRootDto.getParentvo(); +// vreceiptcode = parentvo.getVreceiptcode(); +// pk_corp = parentvo.getPk_corp(); +// csaleid = parentvo.getCsaleid(); +// } else { +// logger.error("第一阶段推送，令人匪夷所思的错误，正常来说是不可能执行到这里的，sendU8CTOCOrder方法的错误会向上抛出! json：{}", JSON.toJSON(soSaleResultRootDto)); +// } +// logger.info("第一阶段：负数销售订单->(自动生成) 负数销售出库单抛出成功，销售订单编号：{} 销售订单主键：{} 销售公司：{}", vreceiptcode, csaleid, pk_corp); isOneSuccess = true; //第一阶段记录成功！ - updateSuccessOrFail2(oldValue, "Y", "success", vreceiptcode, csaleid); + //TODO 临时方案 + vreceiptcode = "暂存"; + csaleid = "暂存"; + updateSuccessOrFail2(oldValue, "S", "暂存", vreceiptcode, csaleid); +// updateSuccessOrFail2(oldValue, "Y", "success", vreceiptcode, csaleid); } else { isOneSuccess = true; logger.info("交易成功-红 业务日期：{} 汇总维度：{} 已经推送成功，不需要重新推送", header.getTradeSuccessAt(), keyGroup); @@ -2643,17 +2651,21 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { String vreceiptcode = null; String pk_corp = null; String csaleid = null; - if (soSaleResultRootDto != null && soSaleResultRootDto.getParentvo() != null) { - SoSaleResultHeadDto parentvo = soSaleResultRootDto.getParentvo(); - vreceiptcode = parentvo.getVreceiptcode(); - pk_corp = parentvo.getPk_corp(); - csaleid = parentvo.getCsaleid(); - } else { - logger.error("第二阶段推送，令人匪夷所思的错误，正常来说是不可能执行到这里的，sendU8CTOCOrder方法的错误会向上抛出! json：{}", JSON.toJSON(soSaleResultRootDto)); - } - logger.info("第二阶段：负数销售订单->(自动生成) 负数销售出库单抛出成功，销售订单编号：{} 销售订单主键：{} 销售公司：{}", vreceiptcode, csaleid, pk_corp); +// if (soSaleResultRootDto != null && soSaleResultRootDto.getParentvo() != null) { +// SoSaleResultHeadDto parentvo = soSaleResultRootDto.getParentvo(); +// vreceiptcode = parentvo.getVreceiptcode(); +// pk_corp = parentvo.getPk_corp(); +// csaleid = parentvo.getCsaleid(); +// } else { +// logger.error("第二阶段推送，令人匪夷所思的错误，正常来说是不可能执行到这里的，sendU8CTOCOrder方法的错误会向上抛出! json：{}", JSON.toJSON(soSaleResultRootDto)); +// } +// logger.info("第二阶段：负数销售订单->(自动生成) 负数销售出库单抛出成功，销售订单编号：{} 销售订单主键：{} 销售公司：{}", vreceiptcode, csaleid, pk_corp); + //TODO 临时方案 + vreceiptcode = "暂存"; + csaleid = "暂存"; //第二阶段记录成功 - updateSuccessOrFail3(oldValue, "Y", "success", vreceiptcode, csaleid); + updateSuccessOrFail3(oldValue, "S", "暂存", vreceiptcode, csaleid); +// updateSuccessOrFail3(oldValue, "Y", "success", vreceiptcode, csaleid); } catch (Exception e) { logger.error("第二阶段：销售订单 ->(自动生成) 销售出库单 ->(自动生成) 销售发票失败", e); String message = e.getMessage(); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java index 7a526807..96606acf 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java @@ -875,22 +875,26 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { } //销售订单单据推送到u8c - List saleorderRequestDtoList = new ArrayList<>(); - saleorderRequestDtoList.add(saleorderRequestDto); - Map> stringStringMap = new HashMap<>(); - stringStringMap.put("saleorder", saleorderRequestDtoList); - SoSaleResultRootDto soSaleResultRootDto = sendU8CTOCOrder(JSON.toJSONString(stringStringMap)); +// List saleorderRequestDtoList = new ArrayList<>(); +// saleorderRequestDtoList.add(saleorderRequestDto); +// Map> stringStringMap = new HashMap<>(); +// stringStringMap.put("saleorder", saleorderRequestDtoList); +// SoSaleResultRootDto soSaleResultRootDto = sendU8CTOCOrder(JSON.toJSONString(stringStringMap)); String vreceiptcode = null; String pk_corp = null; String csaleid = null; - if (soSaleResultRootDto != null && soSaleResultRootDto.getParentvo() != null) { - vreceiptcode = soSaleResultRootDto.getParentvo().getVreceiptcode(); - pk_corp = soSaleResultRootDto.getParentvo().getPk_corp(); - csaleid = soSaleResultRootDto.getParentvo().getCsaleid(); - } - logger.info("TOC销售订单编号：{} 主键：{} 销售公司：{}", vreceiptcode, csaleid, pk_corp); +// if (soSaleResultRootDto != null && soSaleResultRootDto.getParentvo() != null) { +// vreceiptcode = soSaleResultRootDto.getParentvo().getVreceiptcode(); +// pk_corp = soSaleResultRootDto.getParentvo().getPk_corp(); +// csaleid = soSaleResultRootDto.getParentvo().getCsaleid(); +// } +// logger.info("TOC销售订单编号：{} 主键：{} 销售公司：{}", vreceiptcode, csaleid, pk_corp); + // TODO 临时方案 + vreceiptcode = "暂存"; + csaleid = "暂存"; + updateSuccessOrFail1(oldValue, "S", "暂存", vreceiptcode, csaleid); //记录成功 - updateSuccessOrFail1(oldValue, "Y", "success", vreceiptcode, csaleid); +// updateSuccessOrFail1(oldValue, "Y", "success", vreceiptcode, csaleid); } catch (Exception e) { logger.error("TOC退货业务转换成U8C对象过程中、或者单据推送到U8C出现异常！", e); //记录失败 @@ -1150,22 +1154,27 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { } //销售订单单据推送到u8c - List saleorderRequestDtoList = new ArrayList<>(); - saleorderRequestDtoList.add(saleorderRequestDto); - Map> stringStringMap = new HashMap<>(); - stringStringMap.put("saleorder", saleorderRequestDtoList); - SoSaleResultRootDto soSaleResultRootDto = sendU8CTOCOrder(JSON.toJSONString(stringStringMap)); +// List saleorderRequestDtoList = new ArrayList<>(); +// saleorderRequestDtoList.add(saleorderRequestDto); +// Map> stringStringMap = new HashMap<>(); +// stringStringMap.put("saleorder", saleorderRequestDtoList); +// SoSaleResultRootDto soSaleResultRootDto = sendU8CTOCOrder(JSON.toJSONString(stringStringMap)); String vreceiptcode = null; String pk_corp = null; String csaleid = null; - if (soSaleResultRootDto != null && soSaleResultRootDto.getParentvo() != null) { - vreceiptcode = soSaleResultRootDto.getParentvo().getVreceiptcode(); - pk_corp = soSaleResultRootDto.getParentvo().getPk_corp(); - csaleid = soSaleResultRootDto.getParentvo().getCsaleid(); - } - logger.info("TOC销售订单编号：{} 销售订单主键：{} 销售公司：{}", vreceiptcode, csaleid, pk_corp); - //记录成功updateSuccessOrFail2(oldValue, "Y", "success", vreceiptcode, csaleid); +// if (soSaleResultRootDto != null && soSaleResultRootDto.getParentvo() != null) { +// vreceiptcode = soSaleResultRootDto.getParentvo().getVreceiptcode(); +// pk_corp = soSaleResultRootDto.getParentvo().getPk_corp(); +// csaleid = soSaleResultRootDto.getParentvo().getCsaleid(); +// } +// logger.info("TOC销售订单编号：{} 销售订单主键：{} 销售公司：{}", vreceiptcode, csaleid, pk_corp); + // TODO 临时方案 + vreceiptcode = "暂存"; + csaleid = "暂存"; + //记录成功 + updateSuccessOrFail2(oldValue, "S", "暂存", vreceiptcode, csaleid); +// updateSuccessOrFail2(oldValue, "Y", "success", vreceiptcode, csaleid); } catch (Exception e) { logger.error("TOC退货业务转换成U8C对象过程中、或者单据推送到U8C出现异常！", e); //记录失败