feature: 查询无税号

1 year ago · 2530591740
parent 0023365133
commit 2530591740
5 changed files with 34 additions and 22 deletions
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java
@ -207,7 +207,8 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService {
            e.printStackTrace();
            throw new JianshuiServiceException("系统异常！");
        }
-        log.info("【销项发票】【大象发票】发票开具请求结果{}", queryResult.toString());
+//        log.info("【销项发票】【大象发票】发票开具请求结果{}", queryResult.toString());
+        log.info("【销项发票】【大象发票】发票开具请求结果");

        // 判断外层报文是否成功
        if (queryResult.isError()) {
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java
@ -296,7 +296,8 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
            e.printStackTrace();
            throw new JianshuiServiceException("系统异常！");
        }
-        log.info("【销项发票】【大象发票】发票开具请求结果{}", queryResult.toString());
+//        log.info("【销项发票】【大象发票】发票开具请求结果-暂不打印", queryResult.toString());
+        log.info("【销项发票】【大象发票】发票开具请求结果-暂不打印");

        // 判断外层报文是否成功
        if (queryResult.isError()) {
@ -3292,7 +3293,8 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
            log.error("【销项发票】【大象接口】【发票开具】发票请求异常，请求报文{}，销方信息{}", JSONUtil.parse(elephantInvoiceAddDTO).toString(), JSONObject.toJSONString(companyservice));
            return new HXResponse("系统异常！");
        }
-        log.info("【销项发票】【大象发票】发票开具请求结果{}", queryResult.toString());
+        log.info("【销项发票】【大象发票】发票开具请求结果");
+//        log.info("【销项发票】【大象发票】发票开具请求结果{}", queryResult.toString());

        // 判断外层报文是否成功
        if (queryResult.isError()) {
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java
@ -343,7 +343,8 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
            e.printStackTrace();
            throw new JianshuiServiceException("系统异常！");
        }
-        log.info("【销项发票】【大象发票】发票开具请求结果{}", queryResult.toString());
+//        log.info("【销项发票】【大象发票】发票开具请求结果{}", queryResult.toString());
+        log.info("【销项发票】【大象发票】发票开具请求结果");

        // 判断外层报文是否成功
        if (queryResult.isError()) {
@ -3395,7 +3396,8 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
            log.error("【销项发票】【大象接口】【发票开具】发票请求异常，请求报文{}，销方信息{}", JSONUtil.parse(elephantInvoiceAddDTO).toString(), JSONObject.toJSONString(companyservice));
            return new HXResponse("系统异常！");
        }
-        log.info("【销项发票】【大象发票】发票开具请求结果{}", queryResult.toString());
+//        log.info("【销项发票】【大象发票】发票开具请求结果{}", queryResult.toString());
+        log.info("【销项发票】【大象发票】发票开具请求结果");

        // 判断外层报文是否成功
        if (queryResult.isError()) {
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/task/InvoiceBackTask.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/task/InvoiceBackTask.java
@ -416,16 +416,17 @@ public class InvoiceBackTask {
                if (BeanUtil.isEmpty(billInfo)) {
                    log.info("billInfo中不存咋，id为：{}", id);
                }
-                Invoice invoice1 = new Invoice();
-                invoice1.setFpqqlsh(billInfo.getFpqqlsh());
-                invoice1.setSellerTaxnum(billInfo.getSellerTaxnum());
-                invoice1.setOutTradeOrderno(billInfo.getOutTradeOrderno());
+                invoice = new Invoice();
+                invoice.setFpqqlsh(billInfo.getFpqqlsh());
+                invoice.setSellerTaxnum(billInfo.getSellerTaxnum());
+                invoice.setOutTradeOrderno(billInfo.getOutTradeOrderno());
            }

            Integer state = invoice.getState() != null ? invoice.getState() : 1;
            log.info(ZQ_BACK_DXHY + "id={},state={}", id, state);
            log.info(ZQ_BACK_DXHY + "请求大象接口更新发票状态，id={},state={}", id, state);

+            try {
                IInvoiceApiService invoiceService = invoiceServiceFactory.getService("elephantV6_invoice");
                Companyservice companyservice = new Companyservice();
                companyservice.setCompanyid(Long.valueOf(invoiceBack.getIdentity()));
@ -435,6 +436,9 @@ public class InvoiceBackTask {
                billInfo.setOutTradeOrderno(invoice.getOutTradeOrderno());
                log.info("发票回调invoice.id={},getOutTradeOrderno()={}，invoice.getFpqqlsh()={}", id, invoice.getOutTradeOrderno(), invoice.getFpqqlsh());
                HXResponse resultDxhy = invoiceService.batchQueryInvoices(billInfo, "fpqqlsh", companyservice);
+            } catch (NumberFormatException e) {
+                log.info("发票回调，拉取异常，拉取大象异常了，id={},异常原因={}", id,e.toString());
+            }


            log.info("发票回调id={}", id);
@ -448,7 +452,7 @@ public class InvoiceBackTask {
                continue;
            }
            state = invoice.getState();
-            log.info(ZQ_BACK_DXHY + "拉去后查询状态为，id={},state={}", id, state);
+            log.info(ZQ_BACK_DXHY + "拉取后查询状态为，id={},state={}", id, state);

            if (state == 20) {
                log.info(ZQ_BACK_DXHY + "20为开票中，不回调，id={},state={}", id, state);
@ -477,7 +481,8 @@ public class InvoiceBackTask {
            if (message.length() > 200) {
                message = message.substring(0, Math.min(message.length(), 200));
            }
-            invoiceBack.setBackMsg("zq:" + message);
+            invoiceBack.setResultCode("zq:" + status);
+            invoiceBack.setResultMsg("zq:" + message);

            if ("0000".equals(status)) {
                invoiceBack.setStatus("1");
@ -485,7 +490,7 @@ public class InvoiceBackTask {
                invoiceBack.setStatus("3");
            } else {
                invoiceBack.setStatus("3");
-                invoiceBack.setResultMsg("k:客户系统回调异常,status=" + status);
+                invoiceBack.setBackMsg("k:客户系统回调异常,status=" + status);
            }
            invoiceBack.setUpdateTime(new Date());
            invoiceBackMapper.updateInvoiceBack(invoiceBack);
@ -513,6 +518,7 @@ public class InvoiceBackTask {
        BillInfo billInfoQuery = new BillInfo();
        billInfoQuery.setFpqqlsh("[\"" + billInfo.getFpqqlsh() + "\"]");
        billInfoQuery.setOutTradeOrderno(billInfo.getOutTradeOrderno());
+        billInfoQuery.setSellerTaxnum(billInfo.getSellerTaxnum());

        log.info("发票回调getOutTradeOrderno()={}，invoice.getFpqqlsh()={}", billInfoQuery.getOutTradeOrderno(), billInfoQuery.getFpqqlsh());
        HXResponse resultDxhy = invoiceService.batchQueryInvoices(billInfoQuery, "fpqqlsh", companyservice);
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java
@ -735,7 +735,8 @@ public class ElephantUtils {
            // 大象v6调用方法（获取结果处理）
            log.info("【销项】【大象工具类】调用V6接口，入参{}", JSONUtil.toJsonStr(dxhyInterfaceRequest));
            dxhyInterfaceResponse = InvokeDxhyApi.dxhyInterfaceInvoke(dxhyInterfaceRequest);
-            log.info("【销项】【大象工具类】请求成功，结果{}", JSONUtil.toJsonStr(dxhyInterfaceResponse));
+//            log.info("【销项】【大象工具类】请求成功，结果{}", JSONUtil.toJsonStr(dxhyInterfaceResponse));
+            log.info("【销项】【大象工具类】请求成功，结果");

            // 返回报文处理为简税报文
            String dataDxhy = dxhyInterfaceResponse.getData();