From 8a395ceba03bb1bc1c11979f858eceae66d406b8 Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Tue, 28 Mar 2023 15:34:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E9=A1=B9=E5=90=88=E5=B9=B6=EF=BC=9A?= =?UTF-8?q?=E8=93=9D=E5=AD=97=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoiceall/service/IInvoiceAllApiLogService.java | 2 +- .../service/impl/InvoiceAllApiLogServiceImpl.java | 4 ++-- .../invoiceall/service/impl/InvoiceAllImpl.java | 4 ++-- .../service/impl/api/JcskInvoiceApiServiceImpl.java | 10 +++++++--- .../com/jianshui/system}/domain/InvoiceAllApiLog.java | 2 +- .../system}/mapper/InvoiceAllApiLogMapper.java | 5 ++--- .../mapper/system}/InvoiceAllApiLogMapper.xml | 2 +- 7 files changed, 16 insertions(+), 13 deletions(-) rename {jianshui-invoice-all/src/main/java/com/jianshui/invoiceall => jianshui-system/src/main/java/com/jianshui/system}/domain/InvoiceAllApiLog.java (96%) rename {jianshui-invoice-all/src/main/java/com/jianshui/invoiceall => jianshui-system/src/main/java/com/jianshui/system}/mapper/InvoiceAllApiLogMapper.java (91%) rename {jianshui-invoice-all/src/main/resources/mapper/invoiceall => jianshui-system/src/main/resources/mapper/system}/InvoiceAllApiLogMapper.xml (97%) diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/IInvoiceAllApiLogService.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/IInvoiceAllApiLogService.java index 9cdaa00..7c6936b 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/IInvoiceAllApiLogService.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/IInvoiceAllApiLogService.java @@ -1,7 +1,7 @@ package com.jianshui.invoiceall.service; import java.util.List; -import com.jianshui.invoiceall.domain.InvoiceAllApiLog; +import com.jianshui.system.domain.InvoiceAllApiLog; /** * API调用记录-金四Service接口 diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllApiLogServiceImpl.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllApiLogServiceImpl.java index 7b818d1..81c24e1 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllApiLogServiceImpl.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllApiLogServiceImpl.java @@ -4,8 +4,8 @@ import java.util.List; import com.jianshui.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.jianshui.invoiceall.mapper.InvoiceAllApiLogMapper; -import com.jianshui.invoiceall.domain.InvoiceAllApiLog; +import com.jianshui.system.mapper.InvoiceAllApiLogMapper; +import com.jianshui.system.domain.InvoiceAllApiLog; import com.jianshui.invoiceall.service.IInvoiceAllApiLogService; /** diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java index 157d7dd..22007b0 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java @@ -27,7 +27,7 @@ import com.jianshui.invoice.domain.Invoice; import com.jianshui.invoice.mapper.BillInfoMapper; import com.jianshui.invoice.mapper.InvoiceMapper; import com.jianshui.common.constant.WebServiceConstant; -import com.jianshui.invoiceall.domain.InvoiceAllApiLog; +import com.jianshui.system.domain.InvoiceAllApiLog; import com.jianshui.invoiceall.domain.InvoiceAllYhdj; import com.jianshui.invoiceall.domain.dto.*; import com.jianshui.invoiceall.domain.dto.jcsk.*; @@ -37,7 +37,7 @@ import com.jianshui.invoiceall.domain.vo.InvoiceAllKschVO; import com.jianshui.invoiceall.domain.vo.jcsk.AddInvoiceVO; import com.jianshui.invoiceall.domain.vo.jcsk.AddRedInvoiceVO; import com.jianshui.invoiceall.domain.vo.jcsk.KschVO; -import com.jianshui.invoiceall.mapper.InvoiceAllApiLogMapper; +import com.jianshui.system.mapper.InvoiceAllApiLogMapper; import com.jianshui.invoiceall.mapper.InvoiceAllYhdjMapper; import com.jianshui.invoiceall.service.IInvoiceAll; import com.jianshui.common.utils.jcsk.ApiHttp; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java index 158d461..41bd74a 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java @@ -27,6 +27,8 @@ import com.jianshui.invoice.domain.dto.api.jcsk.add.InvoiceAllAddmxListTwoDTO; import com.jianshui.invoice.mapper.*; import com.jianshui.invoice.service.IInvoiceApiService; import com.jianshui.invoice.utils.aisino.console.AisinoConsoleUtil; +import com.jianshui.system.domain.InvoiceAllApiLog; +import com.jianshui.system.mapper.InvoiceAllApiLogMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -54,6 +56,8 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { @Autowired private RedinfoMapper redinfoMapper; + @Autowired + private InvoiceAllApiLogMapper allApiLogMapper; @@ -88,7 +92,7 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { for (InvoiceAllAddmxListTwoDTO addmxListDTO : mxList) { ValidateUtils.validate(addmxListDTO); } - // 2022/12/12 现在只是倒下手，那么就是只存一下就行，返回的也是存。不用转回去。 + // 报文转换存储 billInfo.setCompanyId(companyservice.getCompanyid()); billInfo.setServiceSupplierKey("JCSK"); @@ -130,7 +134,7 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { billInfoMapper.updateBillInfo(billInfoRes); // 保存日志 - /*InvoiceAllApiLog allApiLog = new InvoiceAllApiLog(); + InvoiceAllApiLog allApiLog = new InvoiceAllApiLog(); allApiLog.setUrl(WebServiceConstant.LZFPKJ); allApiLog.setSendMsg(""); allApiLog.setResultMsg(""); @@ -145,7 +149,7 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { allApiLogMapper.insertInvoiceAllApiLog(allApiLog); } } - );*/ + ); return new HXResponse("0000",json); } else { diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/InvoiceAllApiLog.java b/jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllApiLog.java similarity index 96% rename from jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/InvoiceAllApiLog.java rename to jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllApiLog.java index b016441..82ca7b4 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/InvoiceAllApiLog.java +++ b/jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllApiLog.java @@ -1,4 +1,4 @@ -package com.jianshui.invoiceall.domain; +package com.jianshui.system.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.jianshui.common.annotation.Excel; diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/mapper/InvoiceAllApiLogMapper.java b/jianshui-system/src/main/java/com/jianshui/system/mapper/InvoiceAllApiLogMapper.java similarity index 91% rename from jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/mapper/InvoiceAllApiLogMapper.java rename to jianshui-system/src/main/java/com/jianshui/system/mapper/InvoiceAllApiLogMapper.java index 83488aa..c379bca 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/mapper/InvoiceAllApiLogMapper.java +++ b/jianshui-system/src/main/java/com/jianshui/system/mapper/InvoiceAllApiLogMapper.java @@ -1,10 +1,9 @@ -package com.jianshui.invoiceall.mapper; +package com.jianshui.system.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jianshui.invoiceall.domain.InvoiceAllApiLog; -import com.jianshui.invoiceall.domain.InvoiceAllYhdj; +import com.jianshui.system.domain.InvoiceAllApiLog; /** * API调用记录-金四Mapper接口 diff --git a/jianshui-invoice-all/src/main/resources/mapper/invoiceall/InvoiceAllApiLogMapper.xml b/jianshui-system/src/main/resources/mapper/system/InvoiceAllApiLogMapper.xml similarity index 97% rename from jianshui-invoice-all/src/main/resources/mapper/invoiceall/InvoiceAllApiLogMapper.xml rename to jianshui-system/src/main/resources/mapper/system/InvoiceAllApiLogMapper.xml index 692d8ad..23f87d6 100644 --- a/jianshui-invoice-all/src/main/resources/mapper/invoiceall/InvoiceAllApiLogMapper.xml +++ b/jianshui-system/src/main/resources/mapper/system/InvoiceAllApiLogMapper.xml @@ -2,7 +2,7 @@ - +