From a13e25a388b8914807f1abfb37b68eaad813fec2 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 26 May 2023 16:39:06 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E5=88=A4=E6=96=AD=E5=85=A8?= =?UTF-8?q?=E7=94=B5=E5=8F=91=E7=A5=A8=E4=B8=8D=E6=B7=BB=E5=8A=A0=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AllocateInvoiceInterfaceServiceImplV3.java | 2 +- .../order/consumer/utils/BeanTransitionUtils.java | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index f12bc682..bb997676 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -894,7 +894,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt insertOrder.stream().forEach(item->{ if (orderInfoService.checkInvoiceRemarksFlag(item.getXhfNsrsbh(), item.getGhfId())) { log.info("ddpcxxReq:{}", JSONObject.toJSONString(ddpcxxReq)); - item.setBz(item.getBz()+";销方公司代码:"+ddpcxxReq.getDDZXX().get(0).getDDTXX().getXHFBM()+",销方公司名称:"+item.getXhfMc()+";"); + item.setBz(StringUtils.isBlank(item.getBz())?"":item.getBz()+";销方公司代码:"+ddpcxxReq.getDDZXX().get(0).getDDTXX().getXHFBM()+",销方公司名称:"+item.getXhfMc()+";"); } }); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 3c90163c..0f0c7d7f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3481,10 +3481,17 @@ public class BeanTransitionUtils { ddtxxBO.setKPLX(req.getZSFHZ()); ddtxxBO.setXHFSBH(deptEntity.getInvoiceNsrsbh()); ddtxxBO.setXHFMC(deptEntity.getInvoiceName()); - ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress()); - ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone()); - ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank()); - ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount()); + if(OrderInfoEnum.ORDER_INVOICE_TYPE_001.getKey().equals(ddpcxxBO.getFPLXDM()) || OrderInfoEnum.ORDER_INVOICE_TYPE_002.getKey().equals(ddpcxxBO.getFPLXDM())){ + ddtxxBO.setXHFDZ(""); + ddtxxBO.setXHFDH(""); + ddtxxBO.setXHFYH(""); + ddtxxBO.setXHFZH(""); + } else { + ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress()); + ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone()); + ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank()); + ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount()); + } ddtxxBO.setGMFBM(req.getZGFBH()); ddtxxBO.setKPR(req.getZKPRXM()); ddtxxBO.setSKR(req.getZSKRXM());