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);