From 1b03b314ac92f65800170a39160daf15b20b525f Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Mon, 12 Jun 2023 15:13:36 +0800 Subject: [PATCH] =?UTF-8?q?task4631=20=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A8=E9=80=81=E5=BC=80=E7=A5=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 3 +-- .../modules/order/controller/BuyerController.java | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index df80e8ba..337d3382 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -153,9 +153,8 @@ public class InvoiceServiceImpl implements InvoiceService { if (buyerEntity == null) { return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!"); } - log.info("开始校验客户信息完整，1"); if (OrderInfoEnum.CHECK_BANK_FLAG_YES.getKey().equals(buyerEntity.getCheckBankFlag())) { - log.info("开始校验客户信息完整，2"); + log.info("开始校验客户信息完整"); if (StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh())) { return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方纳税人识别号为空,请补全!"); } 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 d7df8567..4f93ef72 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 @@ -188,10 +188,10 @@ public class BuyerController { if(buyerEntity.getBuyerEntityDetail() != null && buyerEntity.getBuyerEntityDetail().size() > 0 ){ buyerEntity.getBuyerEntityDetail().forEach(t->{ if("0".equals(t.getDefaultMark())){ - orderInfo.setGhfDz(StringUtils.isBlank(buyerEntity.getAddress())?null:buyerEntity.getAddress()); - orderInfo.setGhfDh(StringUtils.isBlank(buyerEntity.getPhone())?null:buyerEntity.getPhone()); - orderInfo.setGhfYh(StringUtils.isBlank(buyerEntity.getBankOfDeposit())?null:buyerEntity.getBankOfDeposit()); - orderInfo.setGhfZh(StringUtils.isBlank(buyerEntity.getBankNumber())?null:buyerEntity.getBankNumber()); + 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()); } }); }