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 重汽赋值权限信息 // 开始封装请求报文