大象数电开具接口、开具结果查询接口

jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java

@@ -1664,7 +1664,37 @@ public class InvoiceController {
 
 
 
+    /** 导出机动车加密数据(重汽) */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "java.lang.Void", example = "1130", required = true),
+            @ApiImplicitParam(name = "order", value = "请求体", dataType = "java.lang.Void", required = true)})
+    @PostMapping({"/api/invoice/v1/exportVehicleInvoice/{identity}", "/api/invoice/v1/exportVehicleInvoice"})
+    public Object exportVehicleInvoice(HttpServletRequest request, String identity) throws Exception {
+        if (StringUtils.isEmpty(identity)) {
+            return AjaxResult.error(ErrorCode.EMPTY_IDENTITY);
+        }
+        Companyservice companyservice = iCompanyserviceService.selectCompanyserviceByIdentity(identity);
+        if (companyservice == null) {
+            return AjaxResult.error(ErrorCode.COMPANY_NOT_FOUND);
+        }
+        // 获得入口报文适配器
+        String requestAdapterKey = serviceManageService.getRequestAdapterKey("invoice", companyservice.getCompanyid());
+        IInvoiceRequestService invoiceRequestService = invoiceRequestFactory.getService(requestAdapterKey);
+        JSONObject decryptResult = invoiceRequestService.decrypt(request, companyservice, "");
+
+        // 获得请求实例，并且进行扣费
+        String serviceKey = serviceManageService.getCompanyServiceSupplier("invoice", companyservice.getCompanyid());
+        serviceManageService.companyConsume("invoice", companyservice.getCompanyid());
+
+        IInvoiceApiService invoiceService = invoiceServiceFactory.getService(serviceKey);
+        HXResponse result = invoiceService.exportVehicleInvoice(decryptResult, companyservice);
 
+        String responseAdapterKey = serviceManageService.getResponseAdapterKey("invoice", companyservice.getCompanyid());
+        IInvoiceResponseService invoiceResponseService = invoiceResponseFactory.getService(responseAdapterKey);
+
+        return invoiceResponseService.response(result, companyservice, "");
+
+    }
 
 
 

jianshui-invoice/src/main/java/com/jianshui/invoice/constant/elephant/ElephantConstantsV6.java

@@ -14,7 +14,7 @@ public class ElephantConstantsV6 {
     public static String DEV_HOST = "https://sandbox.zncspt.com/api/";
     public static String DEV_ELECLOUD_HOST = "https://sandbox.ele-cloud.com/api/";
     public static String DEV_HOST_LOCAL = "http://140.143.226.17:8087/order-api";
-    public static String DEV_HOST_LOCAL_V6_JingDongYun = "https://js.ele12.com/order-api";
+    public static String DEV_HOST_LOCAL_v6_JingDongYun = "https://js.ele12.com/order-api";
 
     // 生产的域名
     public static String PROD_HOST = "https://openapi.zncspt.com/api/";
@@ -22,7 +22,7 @@ public class ElephantConstantsV6 {
     public static String PROD_ELECLOUD_HOST = "https://openapi.ele-cloud.com/api/";
 
     public static String PROD_HOST_LOCAL = "http://140.143.226.17:8087/order-api";
-    public static String PROD_HOST_LOCAL_V6_JingDongYun = "https://js.ele12.com/order-api";
+    public static String PROD_HOST_LOCAL_v6_JingDongYun = "https://js.ele12.com/order-api";
 
     // 测试的获取token的域名
     public static String DEV_TOKEN_HOST = "https://sandbox.zncspt.com/api/authen/token";
@@ -30,9 +30,9 @@ public class ElephantConstantsV6 {
     public static String PROD_TOKEN_HOST = "https://openapi.zncspt.com/api/authen/token";
 
     // 发票开具冲红                      
-    public static String ADD_INVOICE = "order-api/order-api/V6/AllocateInvoices";
+    public static String ADD_INVOICE = "order-api/v6/GenerateQdInvoice";
-    public static String ADD_INVOICE_LOCALHOST = "/invoice/api/V6/AllocateInvoices";
+    public static String ADD_INVOICE_LOCALHOST = "/invoice/api/v6/GenerateQdInvoice";
-    public static String ADD_INVOICE_METHOD = "AllocateInvoices";
+    public static String ADD_INVOICE_METHOD = "GenerateQdInvoice";
 
     public static String GENERATE_QD_HWYS_INVOICE = "GenerateQdHwysInvoice";
     public static String GENERATE_QD_BDCXS_INVOICE = "GenerateQdBdcxsInvoice";
@@ -40,23 +40,23 @@ public class ElephantConstantsV6 {
     public static String GENERATE_QD_BDXZL_INVOICE = "GenerateQdBdczlInvoice";
 
     // 发票开票结果拉取
-    public static String ADD_INVOICE_RESULT = "order-api/order-api/V6/GetAllocatedInvoices";
+    public static String ADD_INVOICE_RESULT = "order-api/order-api/v6/GetOrderInfoAndInvoiceInfo";
-    public static String ADD_INVOICE_RESULT_LOCALHOST = "/invoice/api/V6/GetAllocatedInvoices";
+    public static String ADD_INVOICE_RESULT_LOCALHOST = "/invoice/api/v6/GetOrderInfoAndInvoiceInfo";
-    public static String ADD_INVOICE_RESULT_METHOD = "GetAllocatedInvoices";
+    public static String ADD_INVOICE_RESULT_METHOD = "GetOrderInfoAndInvoiceInfo";
 
     // 发票详情拉取
-    public static String QUERY_INVOICE = "order-api/order-api/V6/GetOrderInfoAndInvoiceInfo";
+    public static String QUERY_INVOICE = "order-api/order-api/v6/GetOrderInfoAndInvoiceInfo";
-    public static String QUERY_INVOICE_LOCALHOST = "/invoice/api/V6/GetOrderInfoAndInvoiceInfo";
+    public static String QUERY_INVOICE_LOCALHOST = "/invoice/api/v6/GetOrderInfoAndInvoiceInfo";
     public static String QUERY_INVOICE_METHOD = "GetOrderInfoAndInvoiceInfo";
 
 
     // 红字信息表上传
-    public static String REDINFO_UPLOAD = "order-api/order-api/V6/AllocateRedInvoiceApplication";
+    public static String REDINFO_UPLOAD = "order-api/order-api/v6/AllocateRedInvoiceApplication";
-    public static String REDINFO_UPLOAD_LOCALHOST = "/invoice/api/V6/AllocateRedInvoiceApplication";
+    public static String REDINFO_UPLOAD_LOCALHOST = "/invoice/api/v6/AllocateRedInvoiceApplication";
     public static String REDINFO_UPLOAD_METHOD = "AllocateRedInvoiceApplication";
 
-    public static String REDINFO_DOWNLOAD = "order-api/order-api/V6/DownloadRedInvoiceApplicationResult";
+    public static String REDINFO_DOWNLOAD = "order-api/order-api/v6/DownloadRedInvoiceApplicationResult";
-    public static String REDINFO_DOWNLOAD_LOCALHOST = "/invoice/api/V6/DownloadRedInvoiceApplicationResult";
+    public static String REDINFO_DOWNLOAD_LOCALHOST = "/invoice/api/v6/DownloadRedInvoiceApplicationResult";
     public static String REDINFO_DOWNLOAD_METHOD = "DownloadRedInvoiceApplicationResult";
     public static String REDINFO_FIND_LOCALHOST = "/invoice/api/v6/GetRedInvoiceApplication";
     public static String REDINFO_FIND_METHOD = "GetRedInvoiceApplication";
@@ -108,23 +108,23 @@ public class ElephantConstantsV6 {
     public static String DEPRECATE_INVOICE_METHOD = "DeprecateInvoices";
 
     // 发票作废结果查询
-    public static String DEPRECATE_INVOICE_RESULT = "order-api/order-api/V6//QueryInvalidInvoice";
+    public static String DEPRECATE_INVOICE_RESULT = "order-api/order-api/v6//QueryInvalidInvoice";
-    public static String DEPRECATE_INVOICE_RESULT_LOCALHOST = "/invoice/api/V6//QueryInvalidInvoice";
+    public static String DEPRECATE_INVOICE_RESULT_LOCALHOST = "/invoice/api/v6//QueryInvalidInvoice";
-    public static String DEPRECATE_INVOICE_RESULT_METHOD = "order-api/order-api/V6//QueryInvalidInvoice";
+    public static String DEPRECATE_INVOICE_RESULT_METHOD = "order-api/order-api/v6//QueryInvalidInvoice";
 
     // 打印机查询
     public static String QUERY_PRINTER = "";
-    public static String QUERY_PRINTER_LOCALHOST = "/invoice/api/V6/QueryPrinter";
+    public static String QUERY_PRINTER_LOCALHOST = "/invoice/api/v6/QueryPrinter";
     public static String QUERY_PRINTER_METHOD = "QueryPrinter";
 
     // 批量打印
     public static String BATCH_PRINT = "";
-    public static String BATCH_PRINT_LOCALHOST = "/invoice/api/V6/PrintInvoice";
+    public static String BATCH_PRINT_LOCALHOST = "/invoice/api/v6/PrintInvoice";
     public static String BATCH_PRINT_METHOD = "PrintInvoice";
 
 
     // 发票余量查询接口
-    public static String QUERY_INVOICE_STORE = "order-api/order-api/V6/QueryInvoiceStore";
+    public static String QUERY_INVOICE_STORE = "order-api/order-api/v6/QueryInvoiceStore";
 
 
     /**

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/vehicle/TaxEquipmentInfo.java

@@ -0,0 +1,128 @@
+package com.jianshui.invoice.domain.dto.api.aisino.console.vehicle;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 税控设备类型
+ */
+@Getter
+@Setter
+public class TaxEquipmentInfo implements Serializable {
+
+    private String id;
+
+    private String xhfNsrsbh;
+
+    private String xhfMc;
+
+    /**
+     * 组织Id,6.1.4版本从enterpriseNumber改为该值
+     */
+    private String qyId;
+
+    private String sksbCode;
+
+    private String sksbName;
+
+    private String sksbType;
+
+    private Date linkTime;
+
+    /**
+     * 渠道id
+     */
+    private String distributorId;
+
+    /**
+     * 渠道名称
+     */
+    private String distributorName;
+
+    /**
+     * 省份代码
+     */
+    private String sfdm;
+
+    /**
+     * 省份名称
+     */
+    private String sfmc;
+
+    private String bz;
+
+    /**
+     * 删除标志(0:未删除;1:已删除)
+     */
+    private String deleted;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String pageSize;
+
+    private String currentPage;
+
+    /**
+     * 渠道ID
+     */
+    private String qdId;
+
+    /**
+     * 渠道名称
+     */
+    private String qdMc;
+
+    /**
+     * 类型不为空返回全部
+     */
+    private String type;
+
+    /**
+     * 税号数组
+     */
+    private List<String> shList;
+
+    /**
+     * 缓存时间,
+     */
+    private Date cacheDate;
+
+    /**
+     * 开票开关  0开票 1不开票
+     */
+    private String flag;
+
+    /**
+     * 开票控制后失败code
+     */
+    private String flagCode;
+
+    /**
+     * 开票控制后失败msg
+     */
+    private String flagBz;
+
+    /**
+     * 数电服务类型(1:乐企开票,2:RPA开票,空:未设置)
+     */
+    private String qdfwlx;
+
+    /**
+     * 数电授权码
+     */
+    private String qdsqm;
+
+
+    /**
+     * 企业唯一标识,
+     */
+    private String enterpriseNumbers;
+
+}

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/vehicle/VehicleInvoiceExpBo.java

@@ -0,0 +1,44 @@
+package com.jianshui.invoice.domain.dto.api.aisino.console.vehicle;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * 机动车专票加密数据导出
+ */
+@Data
+public class VehicleInvoiceExpBo implements Serializable {
+    
+    /**
+     * 纳税人识别号
+     */
+    private String nsrsbh;
+    /**
+     * 数据权限Id
+     */
+    private String entId;
+    /**
+     * 分机号
+     */
+    private String fjh;
+    /**
+     * 起始时间  yyyy-MM-dd
+     */
+    private String qqsj;
+    /**
+     * 终止时间  yyyy-MM-dd
+     */
+    private String zzsj;
+    /**
+     * 每页显示条数
+     */
+    private Integer pageSize;
+    /**
+     * 当前页数
+     */
+    private Integer currPage;
+
+}

jianshui-invoice/src/main/java/com/jianshui/invoice/service/IInvoiceApiService.java

@@ -342,4 +342,18 @@ public interface IInvoiceApiService {
 
     /** 生成动态二维码接口*/
     HXResponse generateDynamicCode(JSONObject decryptResult, Companyservice companyservice);
+
+    /** 机动车加密接口 */
+    HXResponse exportVehicleInvoice(JSONObject decryptResult, Companyservice companyservice);
+
+
+
+
+
+
+
+
+
+
+
 }

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java

@@ -103,7 +103,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");

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jianshui.invoice.service.impl.api;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 
 import cn.hutool.core.bean.BeanUtil;
@@ -22,6 +23,8 @@ import com.jianshui.invoice.domain.*;
 import com.jianshui.invoice.domain.dto.*;
 import com.jianshui.invoice.domain.dto.api.*;
 import com.jianshui.invoice.domain.dto.api.aisino.console.*;
+import com.jianshui.invoice.domain.dto.api.aisino.console.vehicle.TaxEquipmentInfo;
+import com.jianshui.invoice.domain.dto.api.aisino.console.vehicle.VehicleInvoiceExpBo;
 import com.jianshui.invoice.domain.ele.EleNewMessage;
 import com.jianshui.invoice.domain.vo.api.aisino.console.AisinoConsoleInvoiceAddVO;
 import com.jianshui.invoice.mapper.BillInfoMapper;
@@ -337,6 +340,7 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
     /**
      * 开票接口回调-重汽
      * 2023-09-26
+     *
      * @param callBackUrl
      * @param id
      */
@@ -367,11 +371,12 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
 
     /**
      * 发票打印
-     * @author dxk
+     *
-     * @date 2022/6/29 13:48
      * @param invoice
      * @param companyservice
      * @return com.jianshui.common.core.domain.AjaxResult
+     * @author dxk
+     * @date 2022/6/29 13:48
      */
     @Override
     public AjaxResult printInvoice(Invoice invoice, Companyservice companyservice) {
@@ -381,11 +386,12 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
 
     /**
      * 发票作废
-     * @author dxk
+     *
-     * @date 2022/6/30 9:43
      * @param invoice
      * @param companyservice
      * @return com.jianshui.invoice.domain.dto.HXResponse
+     * @author dxk
+     * @date 2022/6/30 9:43
      */
     @Override
     public HXResponse deprecateInvoice(JSONObject invoice, Companyservice companyservice) {
@@ -469,6 +475,7 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
 
     /**
      * 单个发票查询
+     *
      * @param billInfo
      * @param companyservice
      * @return
@@ -512,6 +519,7 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
 
     /**
      * 发票批量查询
+     *
      * @param billInfo
      * @param byWhat
      * @param companyservice
@@ -593,7 +601,6 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
     }
 
 
-
     @Override
     public HXResponse getRpaAuthStatus(JSONObject decryptResult, Companyservice companyservice) {
         return null;
@@ -604,7 +611,9 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
         return null;
     }
 
-    /** 红字信息表上传*/
+    /**
+     * 红字信息表上传
+     */
     @Override
     public HXResponse uploadRedInfo(Redinfo redinfo, Companyservice companyservice) {
 
@@ -677,7 +686,6 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
         ValidateUtils.validate(redUploadDTO);
 
 
-
         if (redinfo.getRedinfodetailList() == null || redinfo.getRedinfodetailList().size() == 0) {
             return new HXResponse("格式校验失败，请上传明细信息！");
         }
@@ -755,7 +763,9 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
         return null;
     }
 
-    /** 红字信息表下载 */
+    /**
+     * 红字信息表下载
+     */
     @Override
     public HXResponse downloadRedInfo(DownloadRedInfoDTO downloadRedInfoDTO, Companyservice companyservice) {
 
@@ -863,6 +873,7 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
 
     /**
      * 打印机查询
+     *
      * @param queryPrinterDTO
      * @param companyservice
      * @return
@@ -896,6 +907,7 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
 
     /**
      * 发票打印
+     *
      * @param printDTO
      * @param companyservice
      * @return
@@ -958,7 +970,8 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
 
             //返回报文解析
             if (ajaxResult.isError()) {
-                result.put("9999","发票打印失败，发票号码="+printInvoiceDTO.getInfoNumber()+"，发票代码="+printInvoiceDTO.getInfoTypeCode()+"，原因="+ajaxResult.getMsg());;
+                result.put("9999", "发票打印失败，发票号码=" + printInvoiceDTO.getInfoNumber() + "，发票代码=" + printInvoiceDTO.getInfoTypeCode() + "，原因=" + ajaxResult.getMsg());
+                ;
             }
 
             cn.hutool.json.JSONObject resultJSON = JSONUtil.parseObj(ajaxResult.get("data"));
@@ -1034,10 +1047,11 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
 
     /**
      * 总部控制台转简税发票类型
-     * @author dxk
+     *
-     * @date 2022/6/29 17:12
      * @param invoiceType
      * @return java.lang.String
+     * @author dxk
+     * @date 2022/6/29 17:12
      */
     public static String CovertInvoiceTypeReverse(String invoiceType) {
 
@@ -1120,4 +1134,143 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
         return null;
     }
 
+    /**
+     * 机动车加密接口（走的大象，重汽用控制台）
+     */
+    @Override
+    public HXResponse exportVehicleInvoice(JSONObject decryptResult, Companyservice companyservice) {
+
+        // 转换实体参数
+        VehicleInvoiceExpBo vehicleInvoiceExpBo = BeanUtil.copyProperties(decryptResult, VehicleInvoiceExpBo.class);
+
+        // TODO: 2023/10/8 迁移大象  迁移税控  找测试数据
+        if (Objects.isNull(vehicleInvoiceExpBo)) {
+            log.info("请求参数为空");
+        }
+        if (org.apache.commons.lang3.StringUtils.isBlank(vehicleInvoiceExpBo.getNsrsbh())) {
+            log.info("纳税人识别号为空");
+        }
+        if (org.apache.commons.lang3.StringUtils.isBlank(vehicleInvoiceExpBo.getFjh())) {
+            log.info("分机号为空");
+        }
+        if (org.apache.commons.lang3.StringUtils.isBlank(vehicleInvoiceExpBo.getQqsj())) {
+            log.info("起始时间为空");
+        }
+        if (org.apache.commons.lang3.StringUtils.isBlank(vehicleInvoiceExpBo.getZzsj())) {
+            log.info("终止时间为空");
+        }
+
+        String data = exportVehicleInvoice(vehicleInvoiceExpBo);
+        if (org.apache.commons.lang3.StringUtils.isBlank(data)) {
+            log.error("{}机动车加密数据导出，加密数据为空", "");
+            data = "";
+        }
+        String fileName = "机动车专用发票明细" + "_" + vehicleInvoiceExpBo.getFjh()
+                + (vehicleInvoiceExpBo.getQqsj() + "-" + vehicleInvoiceExpBo.getZzsj()) + ".dat";
+
+        // TODO: 2023/10/8 输出到页面
+        // 浏览器处理乱码问题
+        /*String userAgent = request.getHeader(HttpHeaders.USER_AGENT);
+        try {
+            //IE浏览器
+            if (org.apache.commons.lang3.StringUtils.contains(userAgent, ConfigureConstant.REQUEST_HEAD_USER_AGENT_TYPE_MSIE)
+                    || org.apache.commons.lang3.StringUtils.contains(userAgent, ConfigureConstant.REQUEST_HEAD_USER_AGENT_TYPE_TRIDENT)) {
+                fileName = URLEncoder.encode(fileName, "UTF8");
+                log.debug("{}IE浏览器下载", LOGGER_MSG);
+
+            } else if (org.apache.commons.lang3.StringUtils.contains(userAgent, ConfigureConstant.REQUEST_HEAD_USER_AGENT_TYPE_MOZILLA)) {
+                //google,火狐浏览器
+                fileName = new String(fileName.getBytes(StandardCharsets.UTF_8), "ISO8859-1");
+            } else {
+                //其他浏览器
+                fileName = URLEncoder.encode(fileName, "UTF8");
+            }
+
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            response.setHeader("fileName", fileName);
+            response.getOutputStream().write(Base64Encoding.decode(data));
+        } catch (IOException e) {
+            log.error("{}机动车导出加密数据异常:{}", LOGGER_MSG, e);
+        }*/
+
+        return null;
+    }
+
+
+    /**
+     * 1.调用税控获取信息
+     *
+     * @param vehicleInvoiceExpBo
+     * @return
+     */
+    public String exportVehicleInvoice(VehicleInvoiceExpBo vehicleInvoiceExpBo) {
+        //1.调用税控获取终端代码
+        String terminalCode = getTerminalCode(vehicleInvoiceExpBo.getNsrsbh(), vehicleInvoiceExpBo.getEntId());
+
+
+       /* String requestUrl = invoiceConfig.configVehicleInvoiceExp();
+        VehicleInvoiceExpResponse response = HttpInvoiceRequestUtil.vehicleInvoiceExp(requestUrl, vehicleInvoiceExpBo, terminalCode);
+        log.info("机动车导出加密数据  税控底层返回结果：" + JSONUtil.toJsonStr(response));
+        if (Objects.isNull(response)) {
+            log.error("机动车加密数据导出税控返回结果为空!");
+        } else {
+            if (!response.getCode().equals(ConfigureConstant.STRING_0000)) {
+                log.error("机动车加密数据导出错误：" + response.getMsg());
+            }
+        }
+        return response.getVEHICLEINVOICEBUFF();*/
+        return null;
+    }
+
+    /**
+     * 调用税控获取终端代码
+     *
+     * @param nsrsbh
+     * @param entId
+     * @return
+     */
+    public String getTerminalCode(String nsrsbh, String entId) {
+        TaxEquipmentInfo taxEquipmentInfo = queryTaxEquipment(nsrsbh, entId);
+        if (ObjectUtil.isNotNull(taxEquipmentInfo)) {
+            return taxEquipmentInfo.getSksbCode();
+        } else {
+            return "";
+        }
+    }
+
+    /**
+     * 调用基础服务获取税控设备
+     * @param nsrsbh
+     * @param entId
+     * @return
+     */
+    public TaxEquipmentInfo queryTaxEquipment(String nsrsbh, String entId) {
+        TaxEquipmentInfo taxEquipmentInfo = null;
+
+        /*try {
+            //调用基础服务获取税控设备,基础服务封装了真实的entId
+            String configQueryTaxEquipmentUrl = baseServiceConfig.configQueryTaxEquipmentUrl();
+            PageQueryTaxEquipmentReq pageQueryTaxEquipmentReq = new PageQueryTaxEquipmentReq();
+            pageQueryTaxEquipmentReq.setNsrsbh(nsrsbh);
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(entId)) {
+                pageQueryTaxEquipmentReq.setEntId(entId);
+            }
+
+            PageQueryTaxEquipmentRsp pageQueryTaxEquipmentRsp = HttpInvoiceRequestUtilBase.queryTaxEquipment(configQueryTaxEquipmentUrl, pageQueryTaxEquipmentReq);
+            if (ObjectUtil.isNotNull(pageQueryTaxEquipmentRsp) && ConfigureConstant.STRING_0000.equals(pageQueryTaxEquipmentRsp.getZTDM())) {
+                if (ObjectUtil.isNotNull(pageQueryTaxEquipmentRsp.getTaxEquipmentInfo())) {
+                    taxEquipmentInfo = pageQueryTaxEquipmentRsp.getTaxEquipmentInfo();
+                }
+            }
+
+        } catch (Exception e) {
+            log.error("{}调用基础服务获取税控设备接口异常:{}", LOGGER_MSG, e);
+        }*/
+
+
+        return taxEquipmentInfo;
+    }
+
+
 }

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java

@@ -854,6 +854,12 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService {
     }
 
 
+    @Override
+    public HXResponse exportVehicleInvoice(JSONObject decryptResult, Companyservice companyservice) {
+        return null;
+    }
+
+
     /**
      * 申请/上传 红字发票
      *

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java

@@ -212,7 +212,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
         queryBody.put("SFFHSBSJ", "0");
         // queryResult = ElephantUtils.sendRequest(ElephantConstantsV6.ADD_INVOICE_RESULT, JSONUtil.parse(queryBody));
         try {
-            queryResult = ElephantUtils.sendRequestWithoutToken(ElephantConstantsV6.ADD_INVOICE_RESULT_LOCALHOST, ElephantConstantsV6.ADD_INVOICE_RESULT_METHOD, JSONUtil.parse(queryBody), companyservice);
+            queryResult = ElephantUtils.sendRequestWithoutTokenV6New(ElephantConstantsV6.ADD_INVOICE_RESULT_LOCALHOST, ElephantConstantsV6.ADD_INVOICE_RESULT_METHOD, JSONUtil.parse(queryBody), companyservice);
         } catch (UnsupportedEncodingException | InvalidKeyException | NoSuchAlgorithmException e) {
             log.error("【销项发票】【大象接口】【发票开具】发票请求异常，请求报文{}，销方信息{}", JSONUtil.parse(elephantInvoiceAddDTO).toString(), JSONObject.toJSONString(companyservice));
             e.printStackTrace();
@@ -786,6 +786,11 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
         return parseResult(dxhyInterfaceResponse);
     }
 
+    @Override
+    public HXResponse exportVehicleInvoice(JSONObject decryptResult, Companyservice companyservice) {
+        return null;
+    }
+
     /**
      * 红字确认单列表查询（数电专用）
      */

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java

@@ -1617,6 +1617,11 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService {
         return null;
     }
 
+    @Override
+    public HXResponse exportVehicleInvoice(JSONObject decryptResult, Companyservice companyservice) {
+        return null;
+    }
+
     /**
      * 简税和金财数科 发票类型互换
      *
@@ -1716,15 +1721,6 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService {
 
 
 
-
-
-
-
-
-
-
-
-
 
 
 }

jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java

@@ -369,7 +369,6 @@ public class ElephantUtils {
         String url = host + uri;
 
 
-
         // 封装大象v6调用类
         DxhyInterfaceRequest dxhyInterfaceRequest = new DxhyInterfaceRequest();
         // 地址
@@ -415,8 +414,6 @@ public class ElephantUtils {
     }
 
 
-
-
     /**
      * 大象请求 大象部署版 1.2.4 无token
      *
@@ -468,7 +465,6 @@ public class ElephantUtils {
         System.out.println(result11);
 
 
-
         int randomInt = RandomUtil.randomInt(10, 100);
         requestBody.put("Nonce", Integer.toString(randomInt));
         requestBody.put("SecretId", secretId);
@@ -597,7 +593,12 @@ public class ElephantUtils {
                 case "u":
                     // return "006";
                     throw new JianshuiParamErrorException("暂不支持的开票类型，请联系管理员！", null, "invoice");
-                case "r":
+                    //普票
+                case "82":
+                    return "002";
+                case "81":
+                    return "001";
+                case "":
                 default:
                     throw new JianshuiParamErrorException("暂不支持的开票类型，请联系管理员！", null, "invoice");
             }
@@ -617,6 +618,10 @@ public class ElephantUtils {
                     return "j";
                 case "006":
                     return "u";
+                case "002":
+                    return "82";
+                case "001":
+                    return "81";
                 default:
                     throw new JianshuiParamErrorException("暂不支持的开票类型，请联系管理员！", null, "invoice");
             }
@@ -625,7 +630,6 @@ public class ElephantUtils {
     }
 
 
-
     /**
      * @Author: kk
      * @Description: 大象接口V6调用工具类  对应销项-》大象-》V6实例
@@ -696,8 +700,8 @@ public class ElephantUtils {
             String codeDxhy = dxhyInterfaceResponse.getCode();
             String messageDxhy = dxhyInterfaceResponse.getMessage();
 
-            if("0000".equals(codeDxhy)){
+            if ("000000".equals(codeDxhy)) {
-                return AjaxResult.success("0000",dataDxhy);
+                return AjaxResult.success("000000", dataDxhy);
             } else {
                 return AjaxResult.error(codeDxhy, messageDxhy);
             }
@@ -710,18 +714,4 @@ public class ElephantUtils {
     }
 
 
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
 }