销项合并：蓝字发票->整理VO

jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/IInvoiceAllYhdjService.java

@@ -1,7 +1,7 @@
 package com.jianshui.invoiceall.service;
 
 import java.util.List;
-import com.jianshui.invoiceall.domain.InvoiceAllYhdj;
+import com.jianshui.system.domain.InvoiceAllYhdj;
 
 /**
  * 金四-用户登记Service接口

jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java

@@ -28,7 +28,7 @@ import com.jianshui.invoice.mapper.BillInfoMapper;
 import com.jianshui.invoice.mapper.InvoiceMapper;
 import com.jianshui.common.constant.WebServiceConstant;
 import com.jianshui.system.domain.InvoiceAllApiLog;
-import com.jianshui.invoiceall.domain.InvoiceAllYhdj;
+import com.jianshui.system.domain.InvoiceAllYhdj;
 import com.jianshui.invoiceall.domain.dto.*;
 import com.jianshui.invoiceall.domain.dto.jcsk.*;
 import com.jianshui.invoiceall.domain.dto.jcsk.add.*;
@@ -38,7 +38,7 @@ 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.system.mapper.InvoiceAllApiLogMapper;
-import com.jianshui.invoiceall.mapper.InvoiceAllYhdjMapper;
+import com.jianshui.system.mapper.InvoiceAllYhdjMapper;
 import com.jianshui.invoiceall.service.IInvoiceAll;
 import com.jianshui.common.utils.jcsk.ApiHttp;
 import org.slf4j.Logger;

jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllYhdjServiceImpl.java

@@ -1,11 +1,11 @@
 package com.jianshui.invoiceall.service.impl;
 
 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.InvoiceAllYhdjMapper;
-import com.jianshui.invoiceall.domain.InvoiceAllYhdj;
+import com.jianshui.system.mapper.InvoiceAllYhdjMapper;
+import com.jianshui.system.domain.InvoiceAllYhdj;
 import com.jianshui.invoiceall.service.IInvoiceAllYhdjService;
 
 /**

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java

@@ -31,7 +31,9 @@ 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.domain.InvoiceAllYhdj;
 import com.jianshui.system.mapper.InvoiceAllApiLogMapper;
+import com.jianshui.system.mapper.InvoiceAllYhdjMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -62,6 +64,8 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService {
     @Autowired
     private InvoiceAllApiLogMapper allApiLogMapper;
 
+    @Autowired
+    private InvoiceAllYhdjMapper yhdjMapper;
 
 
     /**
@@ -215,7 +219,26 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService {
         String systemOrderNo = billInfo.getSystemOrderno();
         BillInfo billInfoResult = billInfoMapper.selectBySystemOrderNo(companyservice.getCompanyid(),systemOrderNo);
 
+        // 查询用户登记参数
+        QueryWrapper<InvoiceAllYhdj> yhdjQueryWrapper = new QueryWrapper<>();
+        yhdjQueryWrapper.eq("nsrsbh",companyservice.getSellertax());
+        InvoiceAllYhdj invoiceAllYhdj = yhdjMapper.selectOne(yhdjQueryWrapper);
+
+        if(BeanUtil.isEmpty(invoiceAllYhdj)){
+            return new HXResponse("用户未登记！");
+        }
+
+        // TODO: 2023/3/28 用户登记表有问题，数据有重复的，看下什么问题1 
+
+
+
         QueryTwoDTO queryDTO = new QueryTwoDTO();
+        queryDTO.setDqbm(invoiceAllYhdj.get);
+        queryDTO.setAsync("");
+        queryDTO.setBsrysfzjhm("");
+        queryDTO.setNsrsbh("");
+        queryDTO.setRequestId("");
+
         // TODO: 2023/3/28 ... 
         
         

jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.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/InvoiceAllYhdjMapper.java

@@ -1,11 +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.invoice.domain.BillInfo;
-import com.jianshui.invoiceall.domain.InvoiceAllYhdj;
-import org.apache.ibatis.annotations.Mapper;
+import com.jianshui.system.domain.InvoiceAllYhdj;
 
 /**
  * 金四-用户登记Mapper接口

jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.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.InvoiceAllYhdjMapper">
+<mapper namespace="com.jianshui.system.mapper.InvoiceAllYhdjMapper">
     
     <resultMap type="InvoiceAllYhdj" id="InvoiceAllYhdjResult">
         <result property="id"    column="id"    />