From 87a0626658c4c4dfc4dd26879d1036c710482542 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 10 May 2023 17:20:47 +0800 Subject: [PATCH 1/9] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/core/job/service/impl/ApplyServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java index 1388b494..fe03e09c 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java @@ -160,6 +160,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e); } } } @@ -295,6 +296,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e); } } @@ -304,6 +306,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e1.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e1); } } } @@ -493,6 +496,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e); } } } @@ -612,6 +616,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e); } } @@ -621,6 +626,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e1.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e1); } } @@ -905,6 +911,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e); } } @@ -920,6 +927,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e1.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e1); } } } From ec7f956a90cdcc345caf293679af058365e8abd7 Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 10 May 2023 19:05:40 +0800 Subject: [PATCH 2/9] =?UTF-8?q?feature=EF=BC=9A=E9=94=80=E9=A1=B9=E7=A5=A8?= =?UTF-8?q?=E6=B1=A0=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=8F=B8=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java | 1 + .../src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java | 2 ++ .../java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java | 1 + 3 files changed, 4 insertions(+) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java index 49eb616c..4ce5f4a9 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/SalesInvoicePushInfos.java @@ -86,6 +86,7 @@ public class SalesInvoicePushInfos { private String buyerAddress; private String buyerPhone; + private String compCode; private List detailList; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java index 816b73fd..701d9348 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java @@ -482,4 +482,6 @@ public class TdxSaleRecordInvoice implements Serializable { private String systemName; private String incentiveFlag; + + private String compCode; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java index 2360f309..c0c14dcc 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java @@ -1825,6 +1825,7 @@ public class InvoicePoolServiceImpl implements InvoicePoolService { invoice.setPrintor(info.getInvoicer()); invoice.setListStatus(info.getListStatus()); invoice.setSystemName(info.getSystemName()); + invoice.setCompany(info.getCompCode()); return invoice; } From 003fa33cf976d2b8d46cc656163fb8cb0e138ed4 Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 10 May 2023 19:09:25 +0800 Subject: [PATCH 3/9] =?UTF-8?q?feature=EF=BC=9A=E9=94=80=E9=A1=B9=E7=A5=A8?= =?UTF-8?q?=E6=B1=A0=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=8F=B8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java index c0c14dcc..4012a83c 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java @@ -1825,7 +1825,7 @@ public class InvoicePoolServiceImpl implements InvoicePoolService { invoice.setPrintor(info.getInvoicer()); invoice.setListStatus(info.getListStatus()); invoice.setSystemName(info.getSystemName()); - invoice.setCompany(info.getCompCode()); + invoice.setCompCode(info.getCompCode()); return invoice; } From b3c02d2e34a5e46c831ab89e31e0ef2bb9f8f296 Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 10 May 2023 19:14:59 +0800 Subject: [PATCH 4/9] =?UTF-8?q?feature=EF=BC=9A=E6=9B=B4=E6=96=B0=E9=94=80?= =?UTF-8?q?=E9=A1=B9=E7=A5=A8=E6=B1=A0=E6=97=B6=E6=9B=B4=E6=96=B0=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java index 4012a83c..5c18342e 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java @@ -1661,6 +1661,7 @@ public class InvoicePoolServiceImpl implements InvoicePoolService { update.setInvoiceStatus(infos.getInvoiceStatus()); update.setStatusUpdateDate(new Date()); } + update.setCompCode(infos.getCompCode()); TDxInvoiceSales tDxInvoiceSales = new TDxInvoiceSales(); tDxInvoiceSales.setQsDate(new Date()); DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); From f078eb5d8d5be433dd1579bb35bcf71fb5857ec7 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 10 May 2023 20:22:31 +0800 Subject: [PATCH 5/9] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=97=A5=E5=BF=97=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/core/job/service/impl/ApplyServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java index fe03e09c..62db241c 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java @@ -651,20 +651,25 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setResDate(new Date()); // 获取统计信息 ApplyStatPo batchData = new ApplyStatPo(); + log.info("111111111111111111111111111111111111111111111111111"); try { DynamicContextHolder.push(db + DbConstant.BASICS_READ); List orgList = confirmDao.getUpgradTaxno(); + log.info("222222222222222222222222222222222222222222222222222222222222222"); if (orgList != null && orgList.size() > 0) { for (TAcOrg acOrg : orgList) { DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); //判断是否为大企业税号 BasisSysDeptCfg baseSysDeptCfg = basisSysDeptCfgDao.selectOne(new QueryWrapper().eq("nsrsbh", acOrg.getTaxno())); if (baseSysDeptCfg != null) { + log.info("333333333333333333333333333333333333333333333333333333333333333"); continue; } TaxCurrent current = confirmDao.qryTaxCurrent(acOrg.getTaxno()); + log.info("444444444444444444444444444444444444444444444444444444444444444444"); List dkList = confirmDao.findAllDkCount(acOrg.getTaxno()); if (current != null) { + log.info("555555555555555555555555555555555555555555555555555555555555555555"); String taxno = current.getCurTaxno(); String curskssq = current.getIncomeMoth(); LocalDate localDate = LocalDate.of(Integer.parseInt(curskssq.substring(0, 4)), @@ -922,12 +927,12 @@ public class ApplyServiceImpl extends ServiceImpl implem } } catch (Exception e1) { - + log.error("执行定时任务报错,报错信息是:{}",e1); DynamicContextHolder.push(db + DbConstant.BUSINESS_WRITE); tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e1.printStackTrace(); - log.error("执行定时任务报错,报错信息是:{}",e1); + } } } From 2e38345833b51084c0c5a16a1cdfbf2d5423a380 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 10 May 2023 20:38:59 +0800 Subject: [PATCH 6/9] =?UTF-8?q?ariesy=20=E5=8E=BB=E6=8E=89=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=97=A5=E5=BF=97&=E4=BF=AE=E5=A4=8D=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=95=B0=E6=8D=AE=E6=BA=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/core/job/service/impl/ApplyServiceImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java index 62db241c..b8c88183 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java @@ -651,25 +651,20 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setResDate(new Date()); // 获取统计信息 ApplyStatPo batchData = new ApplyStatPo(); - log.info("111111111111111111111111111111111111111111111111111"); try { DynamicContextHolder.push(db + DbConstant.BASICS_READ); List orgList = confirmDao.getUpgradTaxno(); - log.info("222222222222222222222222222222222222222222222222222222222222222"); if (orgList != null && orgList.size() > 0) { for (TAcOrg acOrg : orgList) { - DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); + DynamicContextHolder.push(DbConstant.BASICS_READ); //判断是否为大企业税号 BasisSysDeptCfg baseSysDeptCfg = basisSysDeptCfgDao.selectOne(new QueryWrapper().eq("nsrsbh", acOrg.getTaxno())); if (baseSysDeptCfg != null) { - log.info("333333333333333333333333333333333333333333333333333333333333333"); continue; } TaxCurrent current = confirmDao.qryTaxCurrent(acOrg.getTaxno()); - log.info("444444444444444444444444444444444444444444444444444444444444444444"); List dkList = confirmDao.findAllDkCount(acOrg.getTaxno()); if (current != null) { - log.info("555555555555555555555555555555555555555555555555555555555555555555"); String taxno = current.getCurTaxno(); String curskssq = current.getIncomeMoth(); LocalDate localDate = LocalDate.of(Integer.parseInt(curskssq.substring(0, 4)), From a1fa4ce0704f716a4eead53f565da8fb135a4f49 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 10 May 2023 20:42:20 +0800 Subject: [PATCH 7/9] =?UTF-8?q?ariesy=20=E5=8E=BB=E6=8E=89ip=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/InterfaceController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index 307d0696..08e18366 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -967,11 +967,11 @@ public class InterfaceController extends AbstractController { log.info("接收的push参数globalInfo={}",globalInfo); // 校验IP - int blocOne = checkIpBlocAppidService.checkBlocOne(authorize.getAppSecId(), request); - if (blocOne == 0) { - returnResult = checkIpBlocAppidService.getCheckFailure(globalInfo); - return returnResult; - } +// int blocOne = checkIpBlocAppidService.checkBlocOne(authorize.getAppSecId(), request); +// if (blocOne == 0) { +// returnResult = checkIpBlocAppidService.getCheckFailure(globalInfo); +// return returnResult; +// } returnResult = invoicePoolService.salsePush(globalInfo, requestParam, request, response, authorize); } catch (Exception e) { e.printStackTrace(); From 49a41983ab551bd83a371aac21e39b83afdaf60d Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 10 May 2023 20:52:37 +0800 Subject: [PATCH 8/9] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=95=B0=E6=8D=AE=E6=BA=90=E9=97=AE=E9=A2=98=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java index b8c88183..c9bf5e5a 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java @@ -652,16 +652,16 @@ public class ApplyServiceImpl extends ServiceImpl implem // 获取统计信息 ApplyStatPo batchData = new ApplyStatPo(); try { - DynamicContextHolder.push(db + DbConstant.BASICS_READ); List orgList = confirmDao.getUpgradTaxno(); if (orgList != null && orgList.size() > 0) { for (TAcOrg acOrg : orgList) { - DynamicContextHolder.push(DbConstant.BASICS_READ); //判断是否为大企业税号 BasisSysDeptCfg baseSysDeptCfg = basisSysDeptCfgDao.selectOne(new QueryWrapper().eq("nsrsbh", acOrg.getTaxno())); if (baseSysDeptCfg != null) { continue; } + + DynamicContextHolder.push(db + DbConstant.BUSINESS_READ); TaxCurrent current = confirmDao.qryTaxCurrent(acOrg.getTaxno()); List dkList = confirmDao.findAllDkCount(acOrg.getTaxno()); if (current != null) { From 7787aa7ac6e093cb8732edfb7041150b22c2cbe2 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 10 May 2023 21:05:32 +0800 Subject: [PATCH 9/9] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=95=B0=E6=8D=AE=E6=BA=90=E9=97=AE=E9=A2=98=20v3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java index c9bf5e5a..99a8c221 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java @@ -656,6 +656,7 @@ public class ApplyServiceImpl extends ServiceImpl implem if (orgList != null && orgList.size() > 0) { for (TAcOrg acOrg : orgList) { //判断是否为大企业税号 + DynamicContextHolder.push(DbConstant.BASICS_READ); BasisSysDeptCfg baseSysDeptCfg = basisSysDeptCfgDao.selectOne(new QueryWrapper().eq("nsrsbh", acOrg.getTaxno())); if (baseSysDeptCfg != null) { continue;