销项合并：蓝字发票

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接口

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.system.mapper.InvoiceAllApiLogMapper;
-import com.jianshui.invoiceall.domain.InvoiceAllApiLog;
+import com.jianshui.system.domain.InvoiceAllApiLog;
 import com.jianshui.invoiceall.service.IInvoiceAllApiLogService;
 
 /**

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;

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 {

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;

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.system.domain.InvoiceAllApiLog;
-import com.jianshui.invoiceall.domain.InvoiceAllYhdj;
 
 /**
  * API调用记录-金四Mapper接口

jianshui-system/src/main/resources/mapper/system/InvoiceAllApiLogMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jianshui.invoiceall.mapper.InvoiceAllApiLogMapper">
+<mapper namespace="com.jianshui.system.mapper.InvoiceAllApiLogMapper">
     
     <resultMap type="InvoiceAllApiLog" id="InvoiceAllApiLogResult">
         <result property="id"    column="id"    />