From 1d8c3759a9f095a42b7ab13b05c9fe1e14541dd7 Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 12 Oct 2023 17:43:28 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E9=AA=8C=E8=AF=81=E6=9F=A5=E9=AA=8C?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvoiceInterfaceController.java | 47 +++++++++++++++++++ .../service/impl/CheckTaskServiceImpl.java | 1 - 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/controller/InvoiceInterfaceController.java b/dxhy-core/src/main/java/com/dxhy/core/job/controller/InvoiceInterfaceController.java index a1415f02..04a21bbf 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/controller/InvoiceInterfaceController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/controller/InvoiceInterfaceController.java @@ -1,13 +1,23 @@ package com.dxhy.core.job.controller; +import java.math.BigDecimal; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; +import java.util.Map; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import javax.annotation.Resource; +import com.alibaba.cloud.commons.lang.StringUtils; +import com.dxhy.core.job.pojo.CheckNoDetailInvoice; +import com.dxhy.core.job.service.CheckTaskService; import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -31,6 +41,8 @@ public class InvoiceInterfaceController extends AbstractController { @Resource private InvoiceInterfaceService invoiceInterfaceService; + @Resource + private CheckTaskService checkTaskService; @Value("${jxjk.threadNum}") private Integer threadNum; @@ -61,4 +73,39 @@ public class InvoiceInterfaceController extends AbstractController { threadPoolExecutor.awaitTermination(60, TimeUnit.SECONDS); log.info("全票面底账采集任务结束-"); } + + @PostMapping("/checkone") + public void checkone(@RequestBody Map params) { + try { + String invoiceCode = params.get("invoiceCode"); + String billingDate = params.get("billingDate"); + String totalAmount = params.get("totalAmount"); + String invoiceNumber = params.get("invoiceNumber"); + String invoiceType = params.get("invoiceType"); + String checkCode = params.get("checkCode"); + String purchaserTaxNo = params.get("purchaserTaxNo"); + + CheckNoDetailInvoice invoice = new CheckNoDetailInvoice(); + invoice.setInvoiceCode(invoiceCode); + invoice.setInvoiceNo(invoiceNumber); + + DateFormat fmt =new SimpleDateFormat("yyyy-MM-dd"); + Date date = fmt.parse(billingDate); + invoice.setInvoiceDate(date); + if(StringUtils.isNotEmpty(totalAmount)) { + if("31".equals(invoiceType)) { + invoice.setTotalAmount(new BigDecimal(totalAmount)); + }else{ + invoice.setInvoiceAmount(new BigDecimal(totalAmount)); + } + } + invoice.setInvoiceType(invoiceType); + invoice.setCheckCode(checkCode); + invoice.setBuyerTaxNo(purchaserTaxNo); + + checkTaskService.checkOne(invoice, ""); + } catch (Exception e) { + log.error("调用开放平台OCR接口失败,", e); + } + } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java index 0269e3dc..3232964f 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java @@ -229,7 +229,6 @@ public class CheckTaskServiceImpl implements CheckTaskService { if("31".equals(checkNoDetailInvoice.getInvoiceType()) || "32".equals(checkNoDetailInvoice.getInvoiceType()) - || "185".equals(checkNoDetailInvoice.getInvoiceType()) || "186".equals(checkNoDetailInvoice.getInvoiceType())){ // 发票代码 requestData.setInvoiceCode("");