Merge branch 'beta' into xingze

jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java

@@ -113,8 +113,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);

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<InvoiceAllYhdj> yhdjQueryWrapper = new QueryWrapper<>();
                 yhdjQueryWrapper.eq("nsrsbh", yhdj.getNsrsbh());

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/Invoice.java

@@ -301,6 +301,10 @@ public class Invoice extends BaseEntity {
     @Excel(name = "终端号")
     private String terminalNumber;
 
+
+    @Excel(name = "机器编号")
+    private String jqbh;
+
     /**
      * 作废类型
      */
@@ -379,6 +383,10 @@ public class Invoice extends BaseEntity {
     private String zzfphm;
 
 
+    public String getJqbh(){return jqbh;}
+
+    public void setJqbh(String jqbh){this.jqbh = jqbh;}
+
     public String getZzfpdm() {
         return zzfpdm;
     }

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java

@@ -488,6 +488,7 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService {
         // invoice.setcOfdUrl(); // "ofdUrl"
         invoice.setFjh(ddfpxx.getKPJH()); // "分机号"
         invoice.setTerminalNumber(ddfpxx.getKPZD()); // "终端号"
+        invoice.setJqbh(ddfpxx.getKPZD());
         debugLog("断点12", uuid, timestamp);
         // 上传文件到oss
         String defaultStorage = configService.selectConfigByKey("default_storage");