From 699cf8ddeb6a0df395056304ad0c9f8699285e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 18 Jan 2024 18:39:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A6=E6=88=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AisinoInvoiceRequestAdapterImpl.java | 8 +++++ .../api/ElephantInvoiceApiV6ServiceImpl.java | 33 ++++++++++++++++--- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java index 5665e06..40e712f 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java @@ -206,6 +206,14 @@ public class AisinoInvoiceRequestAdapterImpl implements IInvoiceRequestService { } } + if (StringUtils.isBlank(billInfo.getSellerBank())){ + billInfo.setSellerBank(json.getString("xsfkhh")); + } + + if (StringUtils.isBlank(billInfo.getSellerAccount())){ + billInfo.setSellerAccount(json.getString("xsfyhzh")); + } + json = (JSONObject) JSONObject.toJSON(billInfo); } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java index 7066dfd..439f5e9 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java @@ -153,20 +153,45 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { log.error("【销项】【大象发票】开票接口校验异常", e); return new HXResponse("格式校验失败，请检查报文"); } + log.info("billInfo信息：{}",JSONObject.toJSONString(billInfo)); // 订单头信息 DDTXX ddtxx = new DDTXX(billInfo); - log.info("大象V6开票接口订单头信息：{}",JSONObject.toJSONString(ddtxx)); CompanyserviceProp companyserviceProp = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "account_show"); if (companyserviceProp != null && "1".equals(companyserviceProp.getValue())){ StringBuilder bz = new StringBuilder(); if (StringUtils.isNotBlank(ddtxx.getBZ())){ - bz.append(ddtxx.getBZ()+"\n"); + bz.append(ddtxx.getBZ()).append("\n"); } - bz.append("购方开户银行："+ddtxx.getGMFYH()+"\t银行账号："+ddtxx.getGMFZH()+"\n"); - bz.append("销方开户银行："+ddtxx.getXHFYH()+"\t银行账号："+ddtxx.getXHFZH()); + String buyerBank = billInfo.getBuyerBank(); + String buyerAccount = billInfo.getBuyerAccount(); + String sellerAccount = billInfo.getSellerAccount(); + String sellerBank = billInfo.getSellerBank(); + + + bz.append("购方开户银行账号："); + + if (StringUtils.isNotBlank(buyerBank)) { + bz.append("\t").append(buyerBank); + } + if (StringUtils.isNotBlank(buyerAccount)) { + bz.append("\t").append(buyerAccount); + } + + bz.append("\n"); + + bz.append("销方开户银行账号："); + + if (StringUtils.isNotBlank(sellerBank)) { + bz.append("\t").append(sellerBank); + } + if (StringUtils.isNotBlank(sellerAccount)) { + bz.append("\t").append(sellerAccount); + } + + log.info("备注信息：\n{}",bz.toString()); ddtxx.setBZ(bz.toString()); }