diff --git a/jianshui-admin/src/main/resources/application-dev.yml b/jianshui-admin/src/main/resources/application-dev.yml index dc65ff7..b5fa118 100644 --- a/jianshui-admin/src/main/resources/application-dev.yml +++ b/jianshui-admin/src/main/resources/application-dev.yml @@ -96,7 +96,7 @@ elephant_invoice_file: http://127.0.0.1:8081/invoice/fileUrl/ # 德才定制 放到数据库 #elephant_invoice_file_dc: http://127.0.0.1:8088/sdFile/ # 大象V6数电对应平台地址 -ele_url_v6: https://js.ele12.com/order-api1111 +ele_url_v6: https://js.ele12.com/order-api #ele_url_v6: http://192.168.3.60:18108/order-api #ele_url_v6: http://127.0.0.1:18108/order-api # 大象纸票服务对应平台地址 @@ -110,7 +110,7 @@ invoice: file: save: # 文件上传方式 0:数据库 1:oss 2:本地 3:minio - type: 3 + type: 4 minio: url: http://127.0.0.1:8081/file/query/ # 自主授权相关配置 diff --git a/jianshui-admin/src/main/resources/application-prod.yml b/jianshui-admin/src/main/resources/application-prod.yml index 38c3b44..6457e9e 100644 --- a/jianshui-admin/src/main/resources/application-prod.yml +++ b/jianshui-admin/src/main/resources/application-prod.yml @@ -102,4 +102,4 @@ invoice: # 自主授权相关配置 autonomous: authorization: - callbackUrl: http://www.goldentaxcloud.com:8080 \ No newline at end of file + callbackUrl: http://www.goldentaxcloud.com:8080 diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6DxhyServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6DxhyServiceImpl.java index b04189e..a3f92b6 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6DxhyServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6DxhyServiceImpl.java @@ -712,8 +712,6 @@ public class ElephantInvoiceApiV6DxhyServiceImpl implements IInvoiceApiService { }else if (Constants.STRING_4.equals(type)){ // 寿仙谷,直接返回税局地址 invoice.setInvoicePdfUrl( ddfpxx.getSDEWMURL() ); - - saveFileUseLocal(invoice, ddfpxx); } } } @@ -1511,6 +1509,9 @@ public class ElephantInvoiceApiV6DxhyServiceImpl implements IInvoiceApiService { saveFileUseLocal(invoice, ddfpxx); }else if (Constants.STRING_3.equals(type)){ saveFileUseMinio(invoice,ddfpxx,companyservice); + }else if (Constants.STRING_4.equals(type)){ + // 寿仙谷,直接返回税局地址 + invoice.setInvoicePdfUrl( ddfpxx.getSDEWMURL() ); } } } 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 b6d1f7f..9e775a2 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 @@ -734,6 +734,9 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { saveFileUseLocal(invoice, ddfpxx); }else if (Constants.STRING_3.equals(type)){ saveFileUseMinio(invoice,ddfpxx,companyservice); + }else if (Constants.STRING_4.equals(type)){ + // 寿仙谷,直接返回税局地址 + invoice.setInvoicePdfUrl( ddfpxx.getSDEWMURL() ); } } } @@ -1600,6 +1603,9 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { saveFileUseLocal(invoice, ddfpxx); }else if (Constants.STRING_3.equals(type)){ saveFileUseMinio(invoice,ddfpxx,companyservice); + }else if (Constants.STRING_4.equals(type)){ + // 寿仙谷,直接返回税局地址 + invoice.setInvoicePdfUrl( ddfpxx.getSDEWMURL() ); } } } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/InvoiceTest.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/InvoiceTest.java index 39a173f..e577fd6 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/InvoiceTest.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/InvoiceTest.java @@ -47,7 +47,7 @@ public class InvoiceTest { // String key = "TG1NR1N0R3RPcEY0eE55dg=="; // 1132 // String key = "2KF3rawkN1B1gGjwrtBMlQ=="; // 500 // String key = "S1jIlJRLXBNtIFihvQ0VPw=="; // 1501 - String key = "FIQKraT+UheC1GqQtgDM6g=="; // 1205 + String key = "Ylvq8MsKnbAGmYHHvXvw4A=="; // 1228 // 1203 红字发票 // String order = "{" + @@ -370,7 +370,7 @@ public class InvoiceTest { System.out.println(m); System.out.println("------------------------------------------------"); System.out.println("-------------------发票查询(订单号)-----------------------------"); - query = "{\"identity\":\"1200\",\"orderno\":[ '00000000005223210916']}"; + query = "{\"identity\":\"1228\",\"orderno\":[ 'c75ba736caa4461fbde6128b01fac9c3']}"; m = JianshuiInvoiceDecryptUtil.encrypt(query, key); System.out.println(m); System.out.println("------------------------------------------------");