From c5f536465a48d5f583da692701923b79dd3b2fda Mon Sep 17 00:00:00 2001
From: dongxiaoke <1910333201@qq.com>
Date: Wed, 19 Jun 2024 16:44:43 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E9=87=8D=E6=B1=BD=E6=95=B0=E7=94=B5?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D-=E5=8C=B9=E9=85=8D=20=20=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E5=8A=A02024-6-19=20=20=E5=90=8E=E6=9C=9F=E6=B5=AA?=
 =?UTF-8?q?=E6=BD=AE=E6=88=96=E8=80=85=E5=A4=A7=E8=B1=A1=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ephantInvoiceApiV6ByInspurServiceImpl.java | 22 +++++++++++++++++
 .../api/ElephantInvoiceApiV6ServiceImpl.java  | 24 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java
index 2202949..093aae7 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java
@@ -145,6 +145,25 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
     @Override
     public HXResponse addInvoice(BillInfo billInfo, Companyservice companyservice) throws IllegalAccessException, InstantiationException {
 
+        /** 查找权限ID */
+        String entId = "";
+        CompanyserviceProp companyservicePropEntId = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "ent_id");
+        if(companyservicePropEntId != null && StrUtil.isNotEmpty(companyservicePropEntId.getValue()) ){
+            entId = companyservicePropEntId.getValue();
+        }else{
+            log.info("权限id未配置，需配置key名 ent_id，实现权限管理");
+        }
+
+        /** 重汽数电用户名-匹配  临时加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()) ){
+                billInfo.setYHM(companyservicePropYmh.getValue());
+            }else{
+                log.info("权限id未配置，需配置key名 ent_id，实现权限管理");
+            }
+        }
 
         // 预处理
         try {
@@ -171,6 +190,9 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
         String fplxdm = ElephantUtils.transElephantType(invioceType, 1);
         ddpcxx.setFPLXDM(fplxdm);
 
+        // 权限id赋值
+        ddpcxx.setENTID(entId);
+
         if ("001".equals(fplxdm)||"002".equals(fplxdm)){
             CompanyserviceProp companyserviceProp = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "account_show");
 
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 1434ecf..9f095bc 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
@@ -155,6 +155,26 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
     @Override
     public HXResponse addInvoice(BillInfo billInfo, Companyservice companyservice) throws IllegalAccessException, InstantiationException {
 
+        /** 查找权限ID */
+        String entId = "";
+        CompanyserviceProp companyservicePropEntId = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "ent_id");
+        if(companyservicePropEntId != null && StrUtil.isNotEmpty(companyservicePropEntId.getValue()) ){
+            entId = companyservicePropEntId.getValue();
+        }else{
+            log.info("权限id未配置，需配置key名 ent_id，实现权限管理");
+        }
+
+        /** 重汽数电用户名-匹配  临时加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()) ){
+                billInfo.setYHM(companyservicePropYmh.getValue());
+            }else{
+                log.info("权限id未配置，需配置key名 ent_id，实现权限管理");
+            }
+        }
+
 
         // 预处理
         try {
@@ -218,6 +238,9 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
         String fplxdm = ElephantUtils.transElephantType(invioceType, 1);
         ddpcxx.setFPLXDM(fplxdm);
 
+        // 权限id赋值
+        ddpcxx.setENTID(entId);
+
         if ("001".equals(fplxdm)||"002".equals(fplxdm)){
             CompanyserviceProp companyserviceProp = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "account_show");
 
@@ -3288,7 +3311,6 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
             ddmxxxList.add(ddmxxx);
         }
 
-        // TODO kk:2024/6/17  重汽赋值权限信息
 
 
         // 开始封装请求报文