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..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 @@ -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); } } @@ -646,16 +652,17 @@ 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(db + DbConstant.BUSINESS_READ); //判断是否为大企业税号 + 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) { @@ -905,6 +912,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e); } } @@ -915,11 +923,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(); + } } } 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(); 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..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); @@ -1825,6 +1826,7 @@ public class InvoicePoolServiceImpl implements InvoicePoolService { invoice.setPrintor(info.getInvoicer()); invoice.setListStatus(info.getListStatus()); invoice.setSystemName(info.getSystemName()); + invoice.setCompCode(info.getCompCode()); return invoice; }