feature: 开票人匹配

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

@@ -154,8 +154,19 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
             log.info("权限id未配置，需配置key名 ent_id，实现权限管理");
         }
 
-        /** 重汽数电用户名-匹配  临时加2024-6-19  后期浪潮或者大象改  */
         String clerk = billInfo.getClerk() != null ? billInfo.getClerk():"";
+        if(StrUtil.isNotEmpty(clerk)) {
+            CompanyserviceProp companyservicePropClerk = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), clerk);
+            if(companyservicePropClerk != null && StrUtil.isNotEmpty(companyservicePropClerk.getValue()) ){
+                entId = companyservicePropClerk.getValue();
+            }else{
+                log.info("权限id未配置，需配置key名 clerk，实现权限管理");
+            }
+        }
+
+
+        /** 重汽数电用户名-匹配  临时加2024-6-19  后期浪潮或者大象改  */
+       /* String clerk = billInfo.getClerk() != null ? billInfo.getClerk():"";
         if(StrUtil.isNotEmpty(clerk)){
             CompanyserviceProp companyservicePropYmh = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), clerk);
             if(companyservicePropYmh != null && StrUtil.isNotEmpty(companyservicePropYmh.getValue()) ){
@@ -163,7 +174,7 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
             }else{
                 log.info("权限id未配置，需配置key名 ent_id，实现权限管理");
             }
-        }
+        }*/
 
         // 预处理
         try {

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

@@ -164,8 +164,18 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
             log.info("权限id未配置，需配置key名 ent_id，实现权限管理");
         }
 
-        /** 重汽数电用户名-匹配  临时加2024-6-19  后期浪潮或者大象改  */
         String clerk = billInfo.getClerk() != null ? billInfo.getClerk():"";
+        if(StrUtil.isNotEmpty(clerk)) {
+            CompanyserviceProp companyservicePropClerk = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), clerk);
+            if(companyservicePropClerk != null && StrUtil.isNotEmpty(companyservicePropClerk.getValue()) ){
+                entId = companyservicePropClerk.getValue();
+            }else{
+                log.info("权限id未配置，需配置key名 clerk，实现权限管理");
+            }
+        }
+
+        /** 重汽数电用户名-匹配  临时加2024-6-19  后期浪潮或者大象改  */
+        /*String clerk = billInfo.getClerk() != null ? billInfo.getClerk():"";
         if(StrUtil.isNotEmpty(clerk)){
             CompanyserviceProp companyservicePropYmh = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), clerk);
             if(companyservicePropYmh != null && StrUtil.isNotEmpty(companyservicePropYmh.getValue()) ){
@@ -173,7 +183,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
             }else{
                 log.info("权限id未配置，需配置key名 ent_id，实现权限管理");
             }
-        }
+        }*/
 
 
         // 预处理
@@ -3157,6 +3167,15 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
             log.info("权限id未配置，需配置key名 ent_id，实现权限管理");
         }
 
+        String clerk = billInfo.getClerk() != null ? billInfo.getClerk():"";
+        if(StrUtil.isNotEmpty(clerk)) {
+            CompanyserviceProp companyservicePropClerk = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), clerk);
+            if(companyservicePropClerk != null && StrUtil.isNotEmpty(companyservicePropClerk.getValue()) ){
+                entId = companyservicePropClerk.getValue();
+            }else{
+                log.info("权限id未配置，需配置key名 clerk，实现权限管理");
+            }
+        }
 
         Invoice invoiceValidateTemp = new Invoice();
         List<Invoice> invoicesValidate = invoiceMapper.selectByOutTradeOrdernoList(companyservice.getCompanyid(), outNO, "0");