From 7697e7e271c2bd809cfe54c969d1f7dad9385062 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 25 Jul 2023 11:51:49 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=9B=9E=E6=8E=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/order/model/queue/FpTsMqData.java | 5 +++++ .../modules/manager/service/impl/PushInvoiceServiceImpl.java | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/model/queue/FpTsMqData.java b/order-management-common/src/main/java/com/dxhy/order/model/queue/FpTsMqData.java index 5b343da7..bc0de3bd 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/queue/FpTsMqData.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/queue/FpTsMqData.java @@ -25,6 +25,11 @@ public class FpTsMqData implements Serializable { */ private String fpqqlsh; + /** + * 发票请求流水号 + */ + private String pushBackLsh; + /** * 发票代码 * (作废推送需要) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index 9ea14812..43458df3 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -984,7 +984,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { if (OrderInfoEnum.INTERFACE_TYPE_INVOICE_PUSH_STATUS_1.getKey().equals(commonTsMqData.getPushType())) { //开票推送相关业务处理 FpTsMqData fpTsMqData = commonTsMqData.getFpTsMqData(); - updatePushErrorMsgToDb(fpTsMqData.getFpqqlsh(), msg, shList); + updatePushErrorMsgToDb(fpTsMqData.getPushBackLsh(), msg, shList); } else if (OrderInfoEnum.INTERFACE_TYPE_INVOICE_PUSH_STATUS_2.getKey().equals(commonTsMqData.getPushType())) { //作废推送相关业务处理 ZfTsMqData zfTsMqData = commonTsMqData.getZfTsMqData(); @@ -1487,9 +1487,10 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { } orderProcessInfoList.addAll(orderProcessInfos); String fpqqlsh = orderProcessInfos.stream().map(t -> t.getFpqqlsh()).collect(Collectors.joining(",")); - fpTsMqData.setFpqqlsh(fpqqlsh); + fpTsMqData.setPushBackLsh(fpqqlsh); log.info("山能易行发票回推重置流水号{}",fpqqlsh); }else{ + fpTsMqData.setPushBackLsh(orderProcessInfo.getFpqqlsh()); orderProcessInfoList.add(orderProcessInfo); }