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