From e68d45d31b05852f14c8a6aa5debaee5c643615f Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 25 Apr 2023 21:00:49 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=90=8C=E6=AD=A5mdm=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E5=8F=96=E5=80=BC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openapi/service/impl/SDEnregyServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java index f7b06470..00dc696d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java @@ -211,7 +211,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { private static void structureBuyerEntity(BuyerEntity buyerEntity,MdmGmfxxtbReqBO tempMdmGmfxxtbReqBO){ buyerEntity.setTaxpayerCode(tempMdmGmfxxtbReqBO.getDESC14()); buyerEntity.setPurchaseName(tempMdmGmfxxtbReqBO.getDESC1()); - buyerEntity.setPhone(tempMdmGmfxxtbReqBO.getDESC27()); + buyerEntity.setPhone(tempMdmGmfxxtbReqBO.getDESC26()); buyerEntity.setSjh(tempMdmGmfxxtbReqBO.getDESC27()); buyerEntity.setEmail(tempMdmGmfxxtbReqBO.getDESC29()); @@ -220,10 +220,10 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { buyerEntity.setModifyTime(new Date()); // 处理开户行银行 List buyerEntityDetails = new ArrayList<>(); - String buyerAddress = ""; - buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC22()) ? "" : tempMdmGmfxxtbReqBO.getDESC22()); - buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC23()) ? "" : tempMdmGmfxxtbReqBO.getDESC23()); - buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC24()) ? "" : tempMdmGmfxxtbReqBO.getDESC24()); + String buyerAddress = StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC24()) ? "" : tempMdmGmfxxtbReqBO.getDESC24(); +// buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC22()) ? "" : tempMdmGmfxxtbReqBO.getDESC22()); +// buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC23()) ? "" : tempMdmGmfxxtbReqBO.getDESC23()); +// buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC24()) ? "" : tempMdmGmfxxtbReqBO.getDESC24()); buyerEntity.setAddress(buyerAddress); if (tempMdmGmfxxtbReqBO.getMULTICODE() != null && !CollectionUtils.isEmpty(tempMdmGmfxxtbReqBO.getMULTICODE().getVALUELIST())) { @@ -244,7 +244,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { } buyerEntityDetail.setBankAccount(valuelistBO.getDESC4()); buyerEntityDetail.setBankName(valuelistBO.getDESC3()); - buyerEntityDetail.setPhone(tempMdmGmfxxtbReqBO.getDESC27()); + buyerEntityDetail.setPhone(StringUtils.isNotBlank(buyerEntity.getPhone())?buyerEntity.getPhone():""); buyerEntityDetail.setAddress(finalBuyerAddress); buyerEntityDetail.setBuyerManageId(buyerEntity.getId()); buyerEntityDetails.add(buyerEntityDetail);