task4631 修复客户信息推送开票申请单问题

release
WangQi 2 years ago
parent b1b4c1cf7c
commit 1b03b314ac
  1. 3
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
  2. 8
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java

@ -153,9 +153,8 @@ public class InvoiceServiceImpl implements InvoiceService {
if (buyerEntity == null) { if (buyerEntity == null) {
return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!"); return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!");
} }
log.info("开始校验客户信息完整,1");
if (OrderInfoEnum.CHECK_BANK_FLAG_YES.getKey().equals(buyerEntity.getCheckBankFlag())) { if (OrderInfoEnum.CHECK_BANK_FLAG_YES.getKey().equals(buyerEntity.getCheckBankFlag())) {
log.info("开始校验客户信息完整,2"); log.info("开始校验客户信息完整");
if (StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh())) { if (StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh())) {
return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方纳税人识别号为空,请补全!"); return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方纳税人识别号为空,请补全!");
} }

@ -188,10 +188,10 @@ public class BuyerController {
if(buyerEntity.getBuyerEntityDetail() != null && buyerEntity.getBuyerEntityDetail().size() > 0 ){ if(buyerEntity.getBuyerEntityDetail() != null && buyerEntity.getBuyerEntityDetail().size() > 0 ){
buyerEntity.getBuyerEntityDetail().forEach(t->{ buyerEntity.getBuyerEntityDetail().forEach(t->{
if("0".equals(t.getDefaultMark())){ if("0".equals(t.getDefaultMark())){
orderInfo.setGhfDz(StringUtils.isBlank(buyerEntity.getAddress())?null:buyerEntity.getAddress()); orderInfo.setGhfDz(StringUtils.isBlank(t.getAddress())?null:t.getAddress());
orderInfo.setGhfDh(StringUtils.isBlank(buyerEntity.getPhone())?null:buyerEntity.getPhone()); orderInfo.setGhfDh(StringUtils.isBlank(t.getPhone())?null:t.getPhone());
orderInfo.setGhfYh(StringUtils.isBlank(buyerEntity.getBankOfDeposit())?null:buyerEntity.getBankOfDeposit()); orderInfo.setGhfYh(StringUtils.isBlank(t.getBankName())?null:t.getBankName());
orderInfo.setGhfZh(StringUtils.isBlank(buyerEntity.getBankNumber())?null:buyerEntity.getBankNumber()); orderInfo.setGhfZh(StringUtils.isBlank(t.getBankAccount())?null:t.getBankAccount());
} }
}); });
} }

Loading…
Cancel
Save