From 4db3ece12371621bfea058a9708d3f3da0ae8759 Mon Sep 17 00:00:00 2001 From: gaorl Date: Sun, 23 Apr 2023 15:29:15 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9AMDM=E5=90=8C=E6=AD=A5=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E5=9C=B0=E5=9D=80=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=B3=E6=98=8E=E7=BB=86=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SDEnregyServiceImpl.java | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 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 43737924..f7b06470 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 @@ -220,12 +220,13 @@ 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()); + + buyerEntity.setAddress(buyerAddress); if (tempMdmGmfxxtbReqBO.getMULTICODE() != null && !CollectionUtils.isEmpty(tempMdmGmfxxtbReqBO.getMULTICODE().getVALUELIST())) { - 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()); - buyerEntity.setAddress(buyerAddress); List valuelistBOS = tempMdmGmfxxtbReqBO.getMULTICODE().getVALUELIST(); if(valuelistBOS != null && valuelistBOS.size() > 0){ MdmGmfxxtbMulticodeValuelistBO firstValueList = valuelistBOS.get(0); @@ -249,22 +250,22 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { buyerEntityDetails.add(buyerEntityDetail); i++; } - }else if(StringUtils.isNotBlank(tempMdmGmfxxtbReqBO.getDESC27())||StringUtils.isNotBlank(buyerAddress)){ - BuyerEntityDetail buyerEntityDetail = new BuyerEntityDetail(); - buyerEntityDetail.setDefaultMark("0"); - buyerEntityDetail.setBuyerManageId(buyerEntity.getId()); - buyerEntityDetail.setAddress(StringUtils.isNotBlank(buyerEntity.getAddress())?buyerEntity.getAddress():""); - buyerEntityDetail.setPhone(StringUtils.isNotBlank(buyerEntity.getPhone())?buyerEntity.getPhone():""); - buyerEntityDetail.setBankName(""); - buyerEntityDetail.setBankAccount(""); - buyerEntityDetail.setCreateTime(new Date()); - buyerEntityDetail.setUpdateTime(new Date()); - buyerEntityDetails.add(buyerEntityDetail); - } - buyerEntity.setBuyerEntityDetail(buyerEntityDetails); - } + //buyerEntity.setBuyerEntityDetail(buyerEntityDetails); + }else if(StringUtils.isNotBlank(tempMdmGmfxxtbReqBO.getDESC27())||StringUtils.isNotBlank(buyerAddress)){ + BuyerEntityDetail buyerEntityDetail = new BuyerEntityDetail(); + buyerEntityDetail.setDefaultMark("0"); + buyerEntityDetail.setBuyerManageId(buyerEntity.getId()); + buyerEntityDetail.setAddress(StringUtils.isNotBlank(buyerEntity.getAddress())?buyerEntity.getAddress():""); + buyerEntityDetail.setPhone(StringUtils.isNotBlank(buyerEntity.getPhone())?buyerEntity.getPhone():""); + buyerEntityDetail.setBankName(""); + buyerEntityDetail.setBankAccount(""); + buyerEntityDetail.setCreateTime(new Date()); + buyerEntityDetail.setUpdateTime(new Date()); + buyerEntityDetails.add(buyerEntityDetail); + } + buyerEntity.setBuyerEntityDetail(buyerEntityDetails); } /** * 集团物料同步接口