From 0ae5b9f7af6e31d803a4cb2551a60e315dee99aa Mon Sep 17 00:00:00 2001
From: kk <1910333201@qq.com>
Date: Fri, 20 Oct 2023 17:35:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E8=B1=A1V6=E6=95=B0=E7=A7=91=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=B0=81=E8=A3=85=E9=80=9A=E7=94=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AisinoInvoiceRequestAdapterImpl.java      |  2 +-
 .../AisinoConsoleInvoiceApiServiceImpl.java   |  4 ++--
 .../api/ElephantInvoiceApiV6ServiceImpl.java  | 22 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java
index 544d46f..20b002a 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java
@@ -104,7 +104,7 @@ public class AisinoInvoiceRequestAdapterImpl implements IInvoiceRequestService {
         try {
             // TODO: 2023/9/20
 
-            order = AisinoInvoiceDecryptUtil.decrypt(order, JKey);
+//            order = AisinoInvoiceDecryptUtil.decrypt(order, JKey);
         } catch (Exception e) {
             e.printStackTrace();
             throw new JianshuiParamErrorException(ErrorCode.DECRYPT_ERROR, companyservice, "invoice");
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java
index 769fa54..04a7689 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java
@@ -359,9 +359,9 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
         }
 
         try {
-            log.info("【控制台】发票回调接口，发送数据开始，id={}", id);
+            log.info("【控制台】发票回调接口，发送数据开始，id={}，参数={}", id,JSONUtil.toJsonStr(invoice));
             String result = HttpUtil.post(callBackUrl, JSONUtil.toJsonStr(invoice));
-            log.info("【控制台】发票回调接口，发送数据结束，id={},接口返回信息={}", id, JSONUtil.toJsonStr(invoice));
+            log.info("【控制台】发票回调接口，发送数据结束，id={},接口返回信息={}", id, result);
         } catch (Exception e) {
             log.info("【控制台】发票回调接口，发送数据异常，id={}", id);
             throw new RuntimeException(e);
diff --git 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
index 0ce96f1..10baa55 100644
--- 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
@@ -2,6 +2,7 @@ package com.jianshui.invoice.service.impl.api;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.codec.Base64;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -35,6 +36,7 @@ import com.jianshui.invoice.domain.dto.api.elephant.sd.RedUpload;
 import com.jianshui.invoice.domain.ele.EleNewMessage;
 import com.jianshui.invoice.domain.ele.EleOuterMessage;
 import com.jianshui.invoice.domain.ele.HZSQDMessage;
+import com.jianshui.invoice.domain.vo.jcsk.*;
 import com.jianshui.invoice.mapper.BillInfoMapper;
 import com.jianshui.invoice.mapper.InvoiceMapper;
 import com.jianshui.invoice.mapper.RedinfoMapper;
@@ -1912,11 +1914,29 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
             response.put("data", invoice);
 
             return response;
+        }else if (WebServiceConstant.FPEWMXZ.equals(finalServiceId)) {
+
+        } else if (WebServiceConstant.ADD_RED_INVOICE.equals(finalServiceId)) {
+
+        } else if (WebServiceConstant.KSHC.equals(finalServiceId)) {
+
+
+        } else if (WebServiceConstant.CXHZFPXXQRD.equals(finalServiceId)) {
+
+        } else if (WebServiceConstant.SHHZFPXXQRD.equals(finalServiceId)) {
+
+        } else if (WebServiceConstant.QDFPWJHQ.equals(finalServiceId)) {
+
+        } else if (WebServiceConstant.QRCODE.equals(finalServiceId)) {
+
+        } else if (WebServiceConstant.SQHZFPXXQRD.equals(finalServiceId)) {
+
+
         }else{
             return new HXResponse("功能升级中~请稍等~");
         }
 
-//        return response;
+        return new HXResponse("功能升级中~请稍等~");
 
 
     }