From 6e81d1e8749e92406f72f6c7eb5462cf9a994b3f Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Sat, 6 May 2023 09:20:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E4=BA=A4=E5=BB=BA-=E9=94=80=E9=A1=B9?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=B5=8B=E8=AF=95:=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../http/invoiceall/v1/InvoiceAllController.java | 14 +++++++------- .../request/AisinoInvoiceRequestAdapterImpl.java | 2 +- .../java/com/jianshui/invoice/utils/JcskTest.java | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java index 7186a88..6120149 100644 --- a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java +++ b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java @@ -12,6 +12,9 @@ import com.jianshui.invoiceall.factory.IInvoiceAllResponseFactory; import com.jianshui.invoiceall.service.IInvoiceAll; import com.jianshui.invoiceall.service.IInvoiceAllRequestService; import com.jianshui.invoiceall.service.IInvoiceAllResponseService; +import com.jianshui.invoiceall.service.impl.InvoiceAllImpl; +import com.jianshui.invoiceall.service.impl.adapter.request.AisinoIncomeRequestAdapterImpl; +import com.jianshui.invoiceall.service.impl.adapter.response.AisinoIncomeResponseAdapterImpl; import com.jianshui.system.service.ICompanyserviceService; import com.jianshui.system.service.IServiceManageService; import io.swagger.annotations.Api; @@ -72,13 +75,11 @@ public class InvoiceAllController { } // 获得入口报文适配器 - String requestAdapterKey = serviceManageService.getRequestAdapterKey(SERVICE_KEY, companyservice.getCompanyid()); - IInvoiceAllRequestService incomeRequestService = invoiceAllRequestFactory.getService(requestAdapterKey); + IInvoiceAllRequestService incomeRequestService = new AisinoIncomeRequestAdapterImpl(); JSONObject requestBody = incomeRequestService.decrypt(request, companyservice); - // 获得请求实例，并且进行扣费 - String serviceKey = serviceManageService.getCompanyServiceSupplier(SERVICE_KEY, companyservice.getCompanyid()); - IInvoiceAll invoiceAllService = iInvoceiAllServiceFactory.getService(serviceKey); + // 指定请求实例 + IInvoiceAll invoiceAllService = new InvoiceAllImpl(); InvoiceAllYhdjDTO invoiceAllYhdjDTO = requestBody.toJavaObject(InvoiceAllYhdjDTO.class); AjaxResult result = invoiceAllService.registration(companyservice, invoiceAllYhdjDTO); @@ -89,8 +90,7 @@ public class InvoiceAllController { } //返回报文处理器 - String responseAdapterKey = serviceManageService.getResponseAdapterKey(SERVICE_KEY, companyservice.getCompanyid()); - IInvoiceAllResponseService incomeResponseService = invoiceAllResponseFactory.getService(responseAdapterKey); + IInvoiceAllResponseService incomeResponseService = new AisinoIncomeResponseAdapterImpl(); return incomeResponseService.response(result, companyservice, ""); } 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 f508304..52cbbdf 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 @@ -102,7 +102,7 @@ public class AisinoInvoiceRequestAdapterImpl implements IInvoiceRequestService { // 平台解密 try { // TODO: 2023/4/23 调试屏蔽 - 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/utils/JcskTest.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java index bf8cbea..07dc2c5 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java @@ -80,7 +80,7 @@ public class JcskTest { " \"bsryxm\": \"贾宁\",\n" + " \"dlsf\": \"7\",\n" + " \"dlsfmm\": \"139690jn\",\n" + - " \"dlfs\": \"6\",\n" + + " \"dlfs\": \"3\",\n" + " \"dlmm\": \"139690jn\",\n" + " \"dlzh\": \"37028519930620441X\",\n" + " \"nsrmc\": \"城阳区兴顺通制冷设备维修服务部\",\n" + @@ -88,7 +88,7 @@ public class JcskTest { " \"bsrysfzjhm\": \"37028519930620441X\",\n" + " \"bsrysjhm\": \"13969067208\",\n" + " \"zjh\": \"\",\n" + - " \"loginType\": \"0\"\n" + + " \"loginType\": \"1\"\n" + " }\n" + "}"; @@ -158,11 +158,11 @@ public class JcskTest { order = "{\n" + " \"appkey\": \"935248bf224f6c8431cdc1969f029519\",\n" + - " \"dqbm\":\"guangdong\",\n" + + " \"dqbm\":\"qingdao\",\n" + " \"async\": false,\n" + " \"bsrysfzjhm\":\"37028519930620441X\",\n" + " \"nsrsbh\": \"92370214MACAAEK16E\",\n" + - " \"requestId\": \"bac8903e-25e5-491f-838e-cb5d0919b782\",\n" + + " \"requestId\": \"2af023ec-6a08-476a-9f6e-380a0093cbf8\",\n" + " \"serviceId\": \"tycxjk\"\n" + "}"; System.out.println(order);