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 36e2837..f3be740 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 @@ -79,8 +79,9 @@ public class InvoiceAllController { JSONObject requestBody = incomeRequestService.decrypt(request, companyservice); // 指定请求实例 - String serviceKey = serviceManageService.getCompanyServiceSupplier(SERVICE_KEY, companyservice.getCompanyid()); - IInvoiceAll invoiceAllService = iInvoceiAllServiceFactory.getService(serviceKey); + IInvoiceAll invoiceAllService = iInvoceiAllServiceFactory.getService("elephant_invoiceall"); + + InvoiceAllYhdjDTO invoiceAllYhdjDTO = requestBody.toJavaObject(InvoiceAllYhdjDTO.class); AjaxResult result = invoiceAllService.registration(companyservice, invoiceAllYhdjDTO); diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java index ef32d13..2b7db05 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java @@ -102,7 +102,7 @@ public class InvoiceAllImpl implements IInvoiceAll { String data = result.get("data") != null ? result.get("data").toString() : ""; if ("0000".equals(code)) { - InvoiceAllYhdj yhdj = BeanUtil.copyProperties(yhdjDTO, InvoiceAllYhdj.class); + InvoiceAllYhdj yhdj = BeanUtil.copyProperties(yhdjDTO.getJsonData(), InvoiceAllYhdj.class); QueryWrapper yhdjQueryWrapper = new QueryWrapper<>(); yhdjQueryWrapper.eq("nsrsbh", yhdj.getNsrsbh()); 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 71c6186..4a99974 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 @@ -19,8 +19,9 @@ public class JcskTest { // String key = "Nlc6k8hs+KIPiTLxih3IZw=="; // 1486 // String key = "HwHDdrtl8VkuZ/K+mLn0lA=="; // 1235 // String key = "5lkC/Y5cRCtdzeroilBYFw=="; // 1246 - String key = "ubDUJvWWr26KTYHfzz02KA=="; // 1247 -// String key = "kpP/pYUBGWdIRNFswh+1Qg=="; // 1240 +// String key = "ubDUJvWWr26KTYHfzz02KA=="; // 1247 +// String key = "uIawjnF+dXZa60h8cyI/MA=="; // 1483 + String key = "W45KUNcF+EA9rodLz96V2w=="; // 1487 String order = ""; @@ -139,6 +140,29 @@ public class JcskTest { " }\n" + "}";*/ + order = "{ \n" + + " \"appkey\": \"935248bf224f6c8431cdc1969f029519\",\n" + + " \"async\": false,\n" + + " \"bsrysfzjhm\":\"510402199507272626\",\n" + + " \"serviceId\": \"yhdj\",\n" + + " \"dqbm\": \"guangdong\",\n" + + " \"nsrsbh\": \"91440101MA59C5NT7A\",\n" + + " \"jsonData\": {\n" + + " \"bsryxm\": \"毕夏\",\n" + + " \"dlsf\": \"3\",\n" + + " \"dlsfmm\": \"19950727Bks\",\n" + + " \"dlfs\": \"2\",\n" + + " \"dlmm\": \"19950727Bks\",\n" + + " \"dlzh\": \"18620263597\",\n" + + " \"nsrmc\": \"中交(广州)铁道设计研究院有限公司\",\n" + + " \"nsrsbh\": \"91440101MA59C5NT7A\",\n" + + " \"bsrysfzjhm\": \"510402199507272626\",\n" + + " \"bsrysjhm\": \"18620263597\",\n" + + " \"zjh\": \"18620263597\",\n" + + " \"loginType\": \"1\"\n" + + " }\n" + + "}"; + System.out.println(order); m = AisinoInvoiceDecryptUtil.encrypt(order, key); System.out.println("-------------------用户登记-----------------------------"); @@ -250,6 +274,15 @@ public class JcskTest { " \"nsrsbh\": \"92370214MACAAEK16E\",\n" + " \"serviceId\": \"hqrlsbewm\"\n" + "}"; + + order = "{\n" + + " \"appkey\": \"935248bf224f6c8431cdc1969f029519\",\n" + + " \"dqbm\":\"guangdong\",\n" + + " \"async\": false,\n" + + " \"bsrysfzjhm\":\"510402199507272626\",\n" + + " \"nsrsbh\": \"91440101MA59C5NT7A\",\n" + + " \"serviceId\": \"hqrlsbewm\"\n" + + "}"; System.out.println(order); m = AisinoInvoiceDecryptUtil.encrypt(order, key); System.out.println("-------------------获取人脸识别二维码-----------------------------"); @@ -355,6 +388,17 @@ public class JcskTest { order = "{\"appkey\":\"GAu2XyVU4AYiqzPuoVGi4g==\",\"async\":true,\"bsrysfzjhm\":\"440823199706182127\",\"dqbm\":\"guangdong\",\"nsrsbh\":\"91440101MA59P8FD4N\",\"serviceId\":\"fpewmxz\",\"jsonData\":{\"fphm\":\"23442000000082558477\",\"kprq\":\"2023-05-31 09:31:01\"},\"fphm\":\"23442000000082558477\",\"kprq\":\"2023-05-31 09:31:01\"}"; + order = "{\n" + + " \t\"requestId\": \"20230809@2b817d95-4c35-4cc6-b6b6-1b1d8fbb5389\",\n" + + "}"; + + order="{\n" + + "\"GMFSBH\": \"91370181MA3UQT3180\",\n" + + "\"PCH\": \"0827f998cdfd40b0a5626150520b4dea\",\n" + + "\"QRBZ\": \"1\",\n" + + "\"TJSJ\": \"\",\n" + + "\"taxNo\": \"91370181MA3UQT3180\"\n" + + "}"; System.out.println(order); m = AisinoInvoiceDecryptUtil.encrypt(order, key); System.out.println("-------------------获取发票下载地址-----------------------------");