feature: 版式文件下载匹配

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

@@ -47,7 +47,9 @@ import com.jianshui.queue.utils.RedisQueueUtil;
 import com.jianshui.storage.domain.StorageUrlDTO;
 import com.jianshui.storage.factory.StorageFactory;
 import com.jianshui.storage.service.IStorageService;
+import com.jianshui.system.domain.CompanyserviceProp;
 import com.jianshui.system.mapper.CompanyserviceMapper;
+import com.jianshui.system.mapper.CompanyservicePropMapper;
 import com.jianshui.system.service.ISysConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -94,6 +96,9 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService {
     @Autowired
     private IBillInfoService billInfoService;
 
+    @Autowired
+    private CompanyservicePropMapper companyservicePropMapper;
+
     /**
      * 发票开具
      *
@@ -235,7 +240,14 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService {
         queryBody.put("DDQQPCH", billInfo.getSystemOrderno());
         queryBody.put("FPLXDM", fplxdm);
         queryBody.put("SFFHSBSJ", "0");
-        queryBody.put("BSWJ", "1");
+
+        CompanyserviceProp companyservicePropBSWJ = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "BSWJ");
+        if (companyservicePropBSWJ != null && StrUtil.isNotEmpty(companyservicePropBSWJ.getValue())) {
+            queryBody.put("BSWJ", companyservicePropBSWJ.getValue() );
+        } else {
+            queryBody.put("BSWJ", "1");
+        }
+
         // queryResult = ElephantUtils.sendRequest(ElephantConstants.ADD_INVOICE_RESULT, JSONUtil.parse(queryBody));
         try {
             queryResult = ElephantUtils.sendRequestWithoutToken(ElephantConstants.ADD_INVOICE_RESULT_LOCALHOST, ElephantConstants.ADD_INVOICE_RESULT_METHOD, JSONUtil.parse(queryBody), companyservice);
@@ -361,7 +373,14 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService {
         JSONObject queryBody = new JSONObject();
         queryBody.put("NSRSBH", companyservice.getSellertax());
         queryBody.put("DDQQLSH", originBillInfo.getSystemOrderno());
-        queryBody.put("BSWJ", "1");
+
+        CompanyserviceProp companyservicePropBSWJ = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "BSWJ");
+        if (companyservicePropBSWJ != null && StrUtil.isNotEmpty(companyservicePropBSWJ.getValue())) {
+            queryBody.put("BSWJ", companyservicePropBSWJ.getValue() );
+        } else {
+            queryBody.put("BSWJ", "1");
+        }
+
         debugLog("断点4", uuid, timestamp);
 
         // AjaxResult queryResult = ElephantUtils.sendRequest(ElephantConstants.QUERY_INVOICE, JSONUtil.parse(queryBody));

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

@@ -328,7 +328,12 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
         // TODO: 2023/10/8 数电
 
         // TODO kk:2024/7/8 寿仙谷定制  去掉文件流
-        queryBody.put("BSWJ", "1");
+        CompanyserviceProp companyservicePropBSWJ = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "BSWJ");
+        if (companyservicePropBSWJ != null && StrUtil.isNotEmpty(companyservicePropBSWJ.getValue())) {
+            queryBody.put("BSWJ", companyservicePropBSWJ.getValue() );
+        } else {
+            queryBody.put("BSWJ", "1");
+        }
         
         
         // 订单请求流水号
@@ -475,7 +480,15 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
         JSONObject queryBody = new JSONObject();
         queryBody.put("NSRSBH", companyservice.getSellertax());
         queryBody.put("DDQQLSH", originBillInfo.getSystemOrderno());
-        queryBody.put("BSWJ", "1");
+
+        CompanyserviceProp companyservicePropBSWJ = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "BSWJ");
+        if (companyservicePropBSWJ != null && StrUtil.isNotEmpty(companyservicePropBSWJ.getValue())) {
+            queryBody.put("BSWJ", companyservicePropBSWJ.getValue() );
+        } else {
+            queryBody.put("BSWJ", "1");
+        }
+
+
         // TODO kk:2024/7/8 寿仙谷定制 不需要文件流
 //        queryBody.put("BSWJ", "1");
         debugLog("断点4", uuid, timestamp);
@@ -3326,8 +3339,13 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi
         // 订单请求流水号
         queryBody.put("DDQQLSH", billInfo.getSystemOrderno());
 
+        CompanyserviceProp companyservicePropBSWJ = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "BSWJ");
+        if (companyservicePropBSWJ != null && StrUtil.isNotEmpty(companyservicePropBSWJ.getValue())) {
+            queryBody.put("BSWJ", companyservicePropBSWJ.getValue() );
+        } else {
+            queryBody.put("BSWJ", "1");
+        }
 
-        queryBody.put("BSWJ", "1");
         /*// 提取码
         queryBody.put("TQM", "0");
         // 订单号

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

@@ -387,7 +387,12 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
         queryBody.put("DDRQQ", "0");
         // 订单日期止
         queryBody.put("DDRQZ", "0");*/
-        queryBody.put("BSWJ", "1");
+        CompanyserviceProp companyservicePropBSWJ = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "BSWJ");
+        if (companyservicePropBSWJ != null && StrUtil.isNotEmpty(companyservicePropBSWJ.getValue())) {
+            queryBody.put("BSWJ", companyservicePropBSWJ.getValue() );
+        } else {
+            queryBody.put("BSWJ", "1");
+        }
         // queryResult = ElephantUtils.sendRequest(ElephantConstantsV6.ADD_INVOICE_RESULT, JSONUtil.parse(queryBody));
         try {
             queryResult = ElephantUtils.sendRequestWithoutTokenV6New(ElephantConstantsV6.ADD_INVOICE_RESULT_LOCALHOST, ElephantConstantsV6.ADD_INVOICE_RESULT_METHOD, JSONUtil.parse(queryBody), companyservice);
@@ -519,7 +524,14 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
         JSONObject queryBody = new JSONObject();
         queryBody.put("NSRSBH", companyservice.getSellertax());
         queryBody.put("DDQQLSH", originBillInfo.getSystemOrderno());
-        queryBody.put("BSWJ", "1");
+
+        CompanyserviceProp companyservicePropBSWJ = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "BSWJ");
+        if (companyservicePropBSWJ != null && StrUtil.isNotEmpty(companyservicePropBSWJ.getValue())) {
+            queryBody.put("BSWJ", companyservicePropBSWJ.getValue() );
+        } else {
+            queryBody.put("BSWJ", "1");
+        }
+
         debugLog("断点4", uuid, timestamp);
 
         AjaxResult queryResult = null;
@@ -3440,7 +3452,12 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
         queryBody.put("DDRQQ", "0");
         // 订单日期止
         queryBody.put("DDRQZ", "0");*/
-        queryBody.put("BSWJ", "1");
+        CompanyserviceProp companyservicePropBSWJ = companyservicePropMapper.selectPropByKey(companyservice.getCompanyid(), "BSWJ");
+        if (companyservicePropBSWJ != null && StrUtil.isNotEmpty(companyservicePropBSWJ.getValue())) {
+            queryBody.put("BSWJ", companyservicePropBSWJ.getValue() );
+        } else {
+            queryBody.put("BSWJ", "1");
+        }
         // queryResult = ElephantUtils.sendRequest(ElephantConstantsV6.ADD_INVOICE_RESULT, JSONUtil.parse(queryBody));
         try {
             queryResult = ElephantUtils.sendRequestWithoutTokenV6New(ElephantConstantsV6.ADD_INVOICE_RESULT_LOCALHOST, ElephantConstantsV6.ADD_INVOICE_RESULT_METHOD, JSONUtil.parse(queryBody), companyservice);