From a92bcb38a4115cc447106b17a5c4da31269c2091 Mon Sep 17 00:00:00 2001 From: gongquanlin <1025081659@qq.com> Date: Thu, 23 Feb 2023 08:21:35 +0800 Subject: [PATCH] 1 --- .../openapi/api/InvoiceRestSDEnregy.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestSDEnregy.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestSDEnregy.java index 2f633423..70f09e4f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestSDEnregy.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestSDEnregy.java @@ -67,9 +67,14 @@ public class InvoiceRestSDEnregy { List gmfxxtbReqList = new ArrayList<>(); for (MdmGmfxxtbReqBO tempMdmGmfxxtbReqBO : mdmGmfxxtbReqBOS) { GmfxxtbReqBO gmfxxtbReqBO = new GmfxxtbReqBO(); + // 处理客户信息 gmfxxtbReqBO.setGMFBM(tempMdmGmfxxtbReqBO.getCODE()); // 取code - gmfxxtbReqBO.setXHFSBH(tempMdmGmfxxtbReqBO.getDESC14()); - gmfxxtbReqBO.setXHFMC(tempMdmGmfxxtbReqBO.getDESC1()); + gmfxxtbReqBO.setGMFMC(tempMdmGmfxxtbReqBO.getDESC1()); + gmfxxtbReqBO.setGMFSBH(tempMdmGmfxxtbReqBO.getDESC14()); + gmfxxtbReqBO.setGMFDH(tempMdmGmfxxtbReqBO.getDESC26()); + + // gmfxxtbReqBO.setXHFSBH(tempMdmGmfxxtbReqBO.getDESC14()); + // gmfxxtbReqBO.setXHFMC(tempMdmGmfxxtbReqBO.getDESC1()); // 判断下DESC14是否为身份证，如果为身份证，则填写03，否则填写01，其余情况置空 // 身份证正则表达式 @@ -86,9 +91,10 @@ public class InvoiceRestSDEnregy { } } - gmfxxtbReqBO.setGMFMC(tempMdmGmfxxtbReqBO.getDESC48()); - gmfxxtbReqBO.setGMFSBH(tempMdmGmfxxtbReqBO.getDESC49()); - gmfxxtbReqBO.setGMFDH(tempMdmGmfxxtbReqBO.getDESC26()); // ? + String invoiceName = StringUtils.isNotEmpty(tempMdmGmfxxtbReqBO.getDESC48()) ? tempMdmGmfxxtbReqBO.getDESC48() : tempMdmGmfxxtbReqBO.getDESC1(); + gmfxxtbReqBO.setINVOICE_NAME(invoiceName); + String invoiceTaxno = StringUtils.isNotEmpty(tempMdmGmfxxtbReqBO.getDESC49()) ? tempMdmGmfxxtbReqBO.getDESC49() : tempMdmGmfxxtbReqBO.getDESC14(); + gmfxxtbReqBO.setINVOICE_TAXNO(invoiceTaxno); // 根据要求，取VALUELIST中的第一组数据作为银行数据 if (tempMdmGmfxxtbReqBO.getMULTICODE() != null && !CollectionUtils.isEmpty(tempMdmGmfxxtbReqBO.getMULTICODE().getVALUELIST())) { // 处理开户行银行