feature: 不动产销售调整

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

@@ -2076,6 +2076,43 @@ 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/QuerySdInvoiceFileDownload/{identity}", "/api/invoice/v1/QuerySdInvoiceFileDownload", "/invoice/QuerySdInvoiceFileDownload"})
+    public Object QuerySdInvoiceFileDownload(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.QuerySdInvoiceFile(decryptResult, companyservice);
+
+        String responseAdapterKey = serviceManageService.getResponseAdapterKey("invoice", companyservice.getCompanyid());
+        IInvoiceResponseService invoiceResponseService = invoiceResponseFactory.getService(responseAdapterKey);
+
+        return invoiceResponseService.response(result, companyservice, "");
+
+    }
+
 
     /**
      * 发票预览
@@ -2095,9 +2132,7 @@ public class InvoiceController {
             return "未查询到发票信息";
         }
 
-        String fileName = invoiceFile.getFileName();
         String content = invoiceFile.getFileContent();
-
         String co = convertPdfBase64ToImageBase64(content);
 
         return "data:image/jpeg;base64,"+co;

jianshui-framework/src/main/java/com/jianshui/framework/config/SecurityConfig.java

@@ -131,6 +131,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                         "/invoice/qrcodeResult",
                         "/invoice/mailDelivery",
                         "/invoice/QuerySdInvoiceFile",
+                        "/invoice/QuerySdInvoiceFileDownload",
                         "/invoice/QueryFastRedInvoiceResult",
                         "/invoice/fastRedInvoice"
                 )

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/addInvoice/Bdcxsxx.java

@@ -13,9 +13,14 @@ public class Bdcxsxx {
 
     private String KDSBZ; // 跨地(市)标志
 
+    private String BDCDZ; // 不动产地址
+
     private String CQZSH; // 房屋产权证书号/不动产权证号
     private String MJDW; // 面积单位
     private String ZLQQZ; // 租赁期起止
+    private String SJCJHSJE; // 实际成交含税金额
+    private String HDJSJG; // 核定计税价格
+    private String TDZZSXMBH; // 土地增值税项目编号
 
 
 }