From d45b10e5712b72558e243799f466d1ea6de5b241 Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Wed, 29 Mar 2023 13:46:33 +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=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InvoiceAllImpl.java | 4 +- .../impl/api/JcskInvoiceApiServiceImpl.java | 46 ++++++++----------- .../system/domain/InvoiceAllYhdj.java | 25 ++++++++++ .../mapper/system/InvoiceAllYhdjMapper.xml | 12 ++++- 4 files changed, 59 insertions(+), 28 deletions(-) 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 0f9e9c0..1fb43af 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 @@ -101,7 +101,8 @@ public class InvoiceAllImpl implements IInvoiceAll { InvoiceAllYhdj yhdj = BeanUtil.copyProperties(yhdjDTO.getJsonData(), InvoiceAllYhdj.class); QueryWrapper yhdjQueryWrapper = new QueryWrapper<>(); - yhdjQueryWrapper.eq("dlzh", yhdj.getDlzh()); + yhdjQueryWrapper.eq("nsrsbh", yhdj.getNsrsbh()); + yhdjQueryWrapper.eq("identity", companyservice.getIdentity()); InvoiceAllYhdj yhdjTemp = yhdjMapper.selectOne(yhdjQueryWrapper); if (BeanUtil.isNotEmpty(yhdjTemp)) { yhdjTemp = BeanUtil.copyProperties(yhdj, InvoiceAllYhdj.class); @@ -109,6 +110,7 @@ public class InvoiceAllImpl implements IInvoiceAll { yhdjMapper.updateInvoiceAllYhdj(yhdjTemp); } else { yhdj.setCreateTime(new Date()); + yhdj.setIdentityid(companyservice.getIdentity()); yhdjMapper.insertInvoiceAllYhdj(yhdj); } } else { 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 2e34848..5d6819b 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 @@ -137,7 +137,7 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { return new HXResponse(msg); } BillInfo billInfoRes = billInfoMapper.selectBillInfoById(billInfoID); - billInfoRes.setOriginSystemOrderno(requestId); + billInfoRes.setOutTradeOrderno(requestId); billInfoMapper.updateBillInfo(billInfoRes); // 保存日志 @@ -214,35 +214,31 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { @Override public HXResponse queryInvoice(QueryBillInfoDTO billInfo, Companyservice companyservice) { - // TODO: 2023/3/28 查询存库Invoice表 - String systemOrderNo = billInfo.getSystemOrderno(); BillInfo billInfoResult = billInfoMapper.selectBySystemOrderNo(companyservice.getCompanyid(),systemOrderNo); + // requestId=OutTradeOrderno + if(StrUtil.isEmpty(billInfoResult.getOutTradeOrderno())){ + return new HXResponse("未获取到开票记录！"); + } + // 查询用户登记参数 QueryWrapper yhdjQueryWrapper = new QueryWrapper<>(); yhdjQueryWrapper.eq("nsrsbh",companyservice.getSellertax()); + yhdjQueryWrapper.eq("identity",companyservice.getIdentity()); InvoiceAllYhdj invoiceAllYhdj = yhdjMapper.selectOne(yhdjQueryWrapper); - if(BeanUtil.isEmpty(invoiceAllYhdj)){ + 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 ... - - - + queryDTO.setDqbm(invoiceAllYhdj.getDqbm()); + queryDTO.setAsync("false"); + queryDTO.setBsrysfzjhm(invoiceAllYhdj.getBsrysfzjhm()); + queryDTO.setNsrsbh(invoiceAllYhdj.getNsrsbh()); + queryDTO.setRequestId("tycxjk"); + ValidateUtils.validate(queryDTO); String requestId = queryDTO.getRequestId(); @@ -259,8 +255,6 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { if ("0000".equals(code) && StrUtil.isNotEmpty(data)) { - // 2022/12/13 这里所有的接口都走，需要根据具体的id判断接口来存库。 - QueryWrapper apiLogQueryWrapper = new QueryWrapper<>(); apiLogQueryWrapper.eq("request_id",requestId); InvoiceAllApiLog allApiLog = allApiLogMapper.selectOne(apiLogQueryWrapper); @@ -278,8 +272,8 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { if(BeanUtil.isNotEmpty(addInvoiceVO)){ QueryWrapper billInfoQueryWrapper = new QueryWrapper<>(); billInfoQueryWrapper.eq("out_trade_orderno", requestId); - BillInfo billInfo = billInfoMapper.selectOne(billInfoQueryWrapper); - if (BeanUtil.isNotEmpty(billInfo)) { + BillInfo billInfoR = billInfoMapper.selectOne(billInfoQueryWrapper); + if (BeanUtil.isNotEmpty(billInfoR)) { QueryWrapper invoiceQueryWrapper = new QueryWrapper<>(); invoiceQueryWrapper.eq("out_trade_orderno", requestId); Invoice invoice = invoiceMapper.selectOne(invoiceQueryWrapper); @@ -299,8 +293,8 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { invoice.setcOfdUrl(addInvoiceVO.getXmlUrl()); invoice.setState(2); invoiceMapper.updateInvoice(invoice); - billInfo.setState(2); - billInfoMapper.updateById(billInfo); + billInfoR.setState(2); + billInfoMapper.updateById(billInfoR); } else { invoice = BeanUtil.copyProperties(billInfo, Invoice.class); invoice.setFphm(addInvoiceVO.getFphm()); @@ -317,8 +311,8 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { invoice.setcOfdUrl(addInvoiceVO.getXmlUrl()); invoice.setState(2); invoiceMapper.insertInvoice(invoice); - billInfo.setState(2); - billInfoMapper.updateById(billInfo); + billInfoR.setState(2); + billInfoMapper.updateById(billInfoR); } // 返回数据 response.put("data", invoice); diff --git a/jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.java b/jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.java index 8ad5c3a..885515b 100644 --- a/jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.java +++ b/jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.java @@ -86,4 +86,29 @@ public class InvoiceAllYhdj implements Serializable private String remark; + /** identityid */ + private String identityid; + + /** 地区编码 */ + private String dqbm; + + + + + + + + + + + + + + + + + + + + } diff --git a/jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml b/jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml index 7e70887..a3c1be4 100644 --- a/jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml +++ b/jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml @@ -22,10 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, bsryxm, dlsf, dlsfmm, dlfs, dlmm, dlzh, nsrmc, nsrsbh, bsrysfzjhm, bsrysjhm, zjh, create_by, create_time, update_by, update_time, remark from invoice_all_yhdj + select id, bsryxm, dlsf, dlsfmm, dlfs, dlmm, dlzh, nsrmc, nsrsbh, bsrysfzjhm, bsrysjhm, zjh, create_by, create_time, update_by, update_time, remark,identityid,dqbm from invoice_all_yhdj @@ -70,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, remark, + identityid, + dqbm, #{id}, @@ -89,6 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, + #{identityid}, + #{dqbm}, @@ -111,6 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + identityid = #{identityid}, + dqbm = #{dqbm}, where id = #{id}