From fe50ba78ae008e2381917db39bb147e42bd8b562 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 24 Aug 2023 17:15:35 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=AE=A2=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9B=B4=E6=96=B0=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E5=AF=B9=E5=BA=94=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/controller/BuyerController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java index d9759e6a..4d1da194 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java @@ -183,18 +183,18 @@ public class BuyerController { if(buyerEntity.getSynchronizeOrders()){ OrderInfo orderInfo = new OrderInfo(); - orderInfo.setGhfMc(StringUtils.isBlank(buyerEntity.getPurchaseName())?null:buyerEntity.getPurchaseName()); - orderInfo.setGhfNsrsbh(StringUtils.isBlank(buyerEntity.getTaxpayerCode())?null:buyerEntity.getTaxpayerCode()); + orderInfo.setGhfMc(StringUtils.isBlank(buyerEntity.getPurchaseName())?"":buyerEntity.getPurchaseName()); + orderInfo.setGhfNsrsbh(StringUtils.isBlank(buyerEntity.getTaxpayerCode())?"":buyerEntity.getTaxpayerCode()); if (StringUtils.isNotBlank(orderInfo.getGhfNsrsbh())) { orderInfo.setGhfQylx(OrderInfoEnum.GHF_QYLX_04.getKey()); } if(buyerEntity.getBuyerEntityDetail() != null && buyerEntity.getBuyerEntityDetail().size() > 0 ){ buyerEntity.getBuyerEntityDetail().forEach(t->{ if("0".equals(t.getDefaultMark())){ - orderInfo.setGhfDz(StringUtils.isBlank(t.getAddress())?null:t.getAddress()); - orderInfo.setGhfDh(StringUtils.isBlank(t.getPhone())?null:t.getPhone()); - orderInfo.setGhfYh(StringUtils.isBlank(t.getBankName())?null:t.getBankName()); - orderInfo.setGhfZh(StringUtils.isBlank(t.getBankAccount())?null:t.getBankAccount()); + orderInfo.setGhfDz(StringUtils.isBlank(t.getAddress())?"":t.getAddress()); + orderInfo.setGhfDh(StringUtils.isBlank(t.getPhone())?"":t.getPhone()); + orderInfo.setGhfYh(StringUtils.isBlank(t.getBankName())?"":t.getBankName()); + orderInfo.setGhfZh(StringUtils.isBlank(t.getBankAccount())?"":t.getBankAccount()); } }); }