diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/IInvoiceAllYhdjService.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/IInvoiceAllYhdjService.java index a11cdca..fa59b08 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/IInvoiceAllYhdjService.java +++ b/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接口 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 22007b0..0f9e9c0 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 @@ -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; diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllYhdjServiceImpl.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllYhdjServiceImpl.java index 19ec388..e4bb91a 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllYhdjServiceImpl.java +++ b/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; /** 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 39a7a93..2e34848 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 @@ -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 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 ... diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/InvoiceAllYhdj.java b/jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.java similarity index 98% rename from jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/InvoiceAllYhdj.java rename to jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.java index 2facd26..8ad5c3a 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/domain/InvoiceAllYhdj.java +++ b/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; diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/mapper/InvoiceAllYhdjMapper.java b/jianshui-system/src/main/java/com/jianshui/system/mapper/InvoiceAllYhdjMapper.java similarity index 88% rename from jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/mapper/InvoiceAllYhdjMapper.java rename to jianshui-system/src/main/java/com/jianshui/system/mapper/InvoiceAllYhdjMapper.java index 7aab0d2..0b6f471 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/mapper/InvoiceAllYhdjMapper.java +++ b/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接口 diff --git a/jianshui-invoice-all/src/main/resources/mapper/invoiceall/InvoiceAllYhdjMapper.xml b/jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml similarity index 98% rename from jianshui-invoice-all/src/main/resources/mapper/invoiceall/InvoiceAllYhdjMapper.xml rename to jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml index 139eed2..7e70887 100644 --- a/jianshui-invoice-all/src/main/resources/mapper/invoiceall/InvoiceAllYhdjMapper.xml +++ b/jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml @@ -2,7 +2,7 @@ - +