From 40bf3519e93355af6065109089d5431ec237aaa7 Mon Sep 17 00:00:00 2001 From: kane Date: Fri, 8 Sep 2023 17:05:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E5=AD=97=E4=BF=A1=E6=81=AF=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E4=B8=8B=E8=BD=BD=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/api/ElephantInvoiceApiServiceImpl.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java index dd47858..12ed9f3 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java @@ -747,8 +747,7 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService { redinfo.setRedInfoStatus("0"); redinfo.setSellerName(companyservice.getSellername()); redinfo.setSellerTaxnum(companyservice.getSellertax()); -// redinfo.setBillInputTime(TimeUtil.dateFormat(new Date(), "yyyyMMddHHmmss")); - redinfo.setBillInputTime(TimeUtil.dateFormat(new Date(), "yyyyMMdd")); + redinfo.setBillInputTime(TimeUtil.dateFormat(new Date(), "yyyyMMddHHmmss")); List redinfodetailList = redinfo.getRedinfodetailList(); BigDecimal taxfreeamt = new BigDecimal(0); // 不含税金额 BigDecimal tax = new BigDecimal(0); // 税额 @@ -993,8 +992,16 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService { // Date tkrqq = DateUtil.offsetDay(new Date(), -5); // queryJson.put("TKRQQ", DateUtil.format(tkrqq,"yyyyMMdd")); // 填开日期起，可空", // queryJson.put("TKRQZ", DateUtil.format(new Date(),"yyyyMMdd")); // 填开日期止，可空", - queryJson.put("TKRQQ", downloadRedInfoDTO.getBillTimeBegin()); // 填开日期起，可空", - queryJson.put("TKRQZ", downloadRedInfoDTO.getBillTimeEnd()); // 填开日期止，可空", + if (StringUtils.isBlank(downloadRedInfoDTO.getBillTimeBegin())){ + queryJson.put("TKRQQ", downloadRedInfoDTO.getBillTimeBegin()); // 填开日期起，可空", + }else { + queryJson.put("TKRQQ", downloadRedInfoDTO.getBillTimeBegin() + "000000"); // 填开日期起，可空", + } + if (StringUtils.isBlank(downloadRedInfoDTO.getBillTimeEnd())){ + queryJson.put("TKRQZ", downloadRedInfoDTO.getBillTimeEnd()); // 填开日期止，可空", + }else { + queryJson.put("TKRQZ", downloadRedInfoDTO.getBillTimeEnd() + "235959"); // 填开日期止，可空", + } queryJson.put("GMFSBH", redInfoResult.getBuyerTaxnum()); // 购买方税号，可空", queryJson.put("XHFSBH", redInfoResult.getSellerTaxnum()); // 销货方税号，可空",