diff --git a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java index 14a216a..0fcae68 100644 --- a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java +++ b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java @@ -1598,39 +1598,6 @@ 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/getRpaQrCode/{identity}", "/api/invoice/v1/getRpaQrCode"}) - public Object getRpaQrCode(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.getRpaQrCode(decryptResult, companyservice); - - String responseAdapterKey = serviceManageService.getResponseAdapterKey("invoice", companyservice.getCompanyid()); - IInvoiceResponseService invoiceResponseService = invoiceResponseFactory.getService(responseAdapterKey); - - return invoiceResponseService.response(result, companyservice, ""); - - } - - /** 数电实名认证状态查询接口(数电专用接口) */ @ApiImplicitParams({ @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "java.lang.Void", example = "1130", required = true), diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/IInvoiceApiService.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/IInvoiceApiService.java index dc9392e..d19262d 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/IInvoiceApiService.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/IInvoiceApiService.java @@ -98,13 +98,6 @@ public interface IInvoiceApiService { */ HXResponse rpaLogin(JSONObject decryptResult, Companyservice companyservice); - /** - * 数电获取实名认证二维码接口(数电专用接口) - * @param decryptResult - * @param companyservice - * @return - */ - HXResponse getRpaQrCode(JSONObject decryptResult, Companyservice companyservice); /** 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 3b93a60..2749a6f 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 @@ -538,10 +538,7 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService { return null; } - @Override - public HXResponse getRpaQrCode(JSONObject decryptResult, Companyservice companyservice) { - return null; - } + @Override public HXResponse getRpaAuthStatus(JSONObject decryptResult, Companyservice companyservice) { diff --git 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 index fe88727..d33377c 100644 --- 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 @@ -773,10 +773,6 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService { return null; } - @Override - public HXResponse getRpaQrCode(JSONObject decryptResult, Companyservice companyservice) { - return null; - } @Override public HXResponse getRpaAuthStatus(JSONObject decryptResult, Companyservice companyservice) { 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 cbf64d5..f92ab6b 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 @@ -874,25 +874,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { return parseResult(dxhyInterfaceResponse); } - /** - * 数电获取实名认证二维码接口(数电专用接口) - * @param decryptResult - * @param companyservice - * @return - */ - @Override - public HXResponse getRpaQrCode(JSONObject decryptResult, Companyservice companyservice) { - DxhyInterfaceResponse dxhyInterfaceResponse = null; - try { - dxhyInterfaceResponse = ElephantUtils.sendRequestWithoutTokenV6(ElephantConstantsV6.GET_RPA_QY_CODE_LOCALHOST, ElephantConstantsV6.GET_RPA_QY_CODE_METHOD, JSONUtil.parse(decryptResult), companyservice); - } catch (UnsupportedEncodingException | InvalidKeyException | NoSuchAlgorithmException e) { - log.error("【销项发票】【大象接口】【数电】【数电获取实名认证二维码接口】请求异常,请求报文{},销方信息{}", decryptResult, JSONObject.toJSONString(companyservice)); - e.printStackTrace(); - return new HXResponse("009999", "系统异常!"); - } - return parseResult(dxhyInterfaceResponse); - } /** @@ -1781,11 +1763,30 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { return null; } + /** + * 数电获取实名认证二维码接口(数电专用接口) + * @param decryptResult + * @param companyservice + * @return + */ @Override public HXResponse qrcode(JSONObject decryptResult, Companyservice companyservice) { - return null; + + DxhyInterfaceResponse dxhyInterfaceResponse = null; + try { + dxhyInterfaceResponse = ElephantUtils.sendRequestWithoutTokenV6(ElephantConstantsV6.GET_RPA_QY_CODE_LOCALHOST, ElephantConstantsV6.GET_RPA_QY_CODE_METHOD, JSONUtil.parse(decryptResult), companyservice); + } catch (UnsupportedEncodingException | InvalidKeyException | NoSuchAlgorithmException e) { + log.error("【销项发票】【大象接口】【数电】【数电获取实名认证二维码接口】请求异常,请求报文{},销方信息{}", decryptResult, JSONObject.toJSONString(companyservice)); + e.printStackTrace(); + return new HXResponse("009999", "系统异常!"); + } + + return parseResult(dxhyInterfaceResponse); } + + + @Override public HXResponse query(InvoiceAllFileQueryTWODTO invoiceAllFileQueryTWODTO, Companyservice companyservice) { return null; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java index cd34c0b..594428f 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java @@ -384,10 +384,7 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { return null; } - @Override - public HXResponse getRpaQrCode(JSONObject decryptResult, Companyservice companyservice) { - return null; - } + @Override public HXResponse getRpaAuthStatus(JSONObject decryptResult, Companyservice companyservice) {