diff --git a/order-management-consumer/pom.xml b/order-management-consumer/pom.xml
index 471946b2..316e1591 100644
--- a/order-management-consumer/pom.xml
+++ b/order-management-consumer/pom.xml
@@ -555,11 +555,6 @@
redis.clients
jedis
-
- com.alibaba
- fastjson
- 1.2.33
-
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java
index 97d44eea..7ddc4c65 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java
@@ -40,8 +40,11 @@ import com.dxhy.order.consumer.openapi.service.*;
import com.dxhy.order.consumer.utils.BeanTransitionUtils;
import com.dxhy.order.exception.OrderReceiveException;
import com.dxhy.order.invoice.config.InvoiceConfig;
+import com.dxhy.order.invoice.module.fangge.protocol.specialinvoice.FgRedInvoiceDownloadReqNew;
import com.dxhy.order.utils.HttpUtils;
import com.dxhy.order.utils.JsonUtils;
+import com.dxyun.invoice.protocol.InterfaceData;
+import com.dxyun.invoice.protocol.ProtocolUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -456,4 +459,17 @@ public class InvoiceRestApiV6 {
}
return returnJsonString;
}
+
+ public static void main(String[] args) {
+ String data = "{\"machineType\":\"A9\",\"key\":\"1758943343kKgvEzmGFNt9ZaXcVwNtDQ==\",\"taxpayerNo\":\"91370000MA3MN0LK5F\",\"terminalCode\":\"0\",\"machineNo\":\"0\",\"encryCode\":\"2\",\"returnCode\":\"0000\",\"returnMsg\":\"成功\",\"data\":\"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\",\"version\":\"1.3\",\"checkCode\":\"38AB\",\"dataExchangeId\":\"90752129809653204140311854213271\"}";
+ try {
+ InterfaceData interfaceData = ProtocolUtil.decodeData(data);
+ System.out.println(interfaceData.getData());
+ FgRedInvoiceDownloadReqNew fgRedInvoiceDownloadReqBO = JSONObject.parseObject(interfaceData.getData(), FgRedInvoiceDownloadReqNew.class);
+ System.out.println(interfaceData);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
}
diff --git a/order-management-invoice/pom.xml b/order-management-invoice/pom.xml
index 8bdd3e93..c258a946 100644
--- a/order-management-invoice/pom.xml
+++ b/order-management-invoice/pom.xml
@@ -386,6 +386,11 @@
org.springframework
spring-test
+
+ com.alibaba
+ fastjson
+ 1.2.33
+
diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java
index e173f9ed..d458ce4a 100644
--- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java
+++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
+import com.alibaba.fastjson.JSONObject;
import com.dxhy.base.file.common.ExcelReadContext;
import com.dxhy.base.file.handle.ExcelReadHandle;
import com.dxhy.order.baseservice.config.BaseServiceConfig;
@@ -3172,7 +3173,7 @@ public class SpecialInvoiceServiceImpl implements SpecialInvoiceService {
try {
InterfaceData interfaceData = ProtocolUtil.decodeData(data);
log.info("{}方格信息表下载结果,解密后数据为:{}", LOGGER_MSG, interfaceData.getData());
- FgRedInvoiceDownloadReqNew fgRedInvoiceDownloadReqBO = JsonUtils.getInstance().parseObject(interfaceData.getData(), FgRedInvoiceDownloadReqNew.class);
+ FgRedInvoiceDownloadReqNew fgRedInvoiceDownloadReqBO = JSONObject.parseObject(interfaceData.getData(), FgRedInvoiceDownloadReqNew.class);
boolean success = false;
if(ObjectUtil.isNotNull(fgRedInvoiceDownloadReqBO) && ObjectUtil.isNotEmpty(fgRedInvoiceDownloadReqBO.getRED_INVOICE_FORM_DOWNLOADS())){
@@ -3441,4 +3442,13 @@ public class SpecialInvoiceServiceImpl implements SpecialInvoiceService {
return hpResponseExtend;
}
+ public static void main(String[] args) {
+ String data = "{\"bZSL\":\"1\",\"dQBS\":\"1\",\"rED_INVOICE_FORM_DOWNLOADS\":[{\"rED_INVOICE_FORM_DOWN_DETAIL\":[{\"dW\":\"\",\"fPHXZ\":\"\",\"gGXH\":\"\",\"hSBZ\":\"0\",\"lSLBS\":\"\",\"sE\":\"-186110.06\",\"sL\":\"0.090000\",\"sPBM\":\"3040502029902000000\",\"xMDJ\":\"0.000000\",\"xMJE\":\"-2067889.94\",\"xMMC\":\"*经营租赁*土地租赁费\",\"xMSL\":\"0.000000\",\"xMXH\":\"1\",\"yHZCBS\":\"0\",\"zXBM\":\"\",\"zZSTSGL\":\"\"}],\"rED_INVOICE_FORM_DOWN_HEAD\":{\"bMB_BBH\":\"51.0\",\"dSLBZ\":\"0\",\"fPZLDM\":\"\",\"gMF_MC\":\"山东新宝龙工业科技有限公司\",\"gMF_NSRSBH\":\"91370883MA3UQ8PK6W\",\"hJJE\":\"-2067889.94\",\"hJSE\":\"-186110.06\",\"sQBSCLSH\":\"667902776911231213094743\",\"sQDH\":\"667902776911231213094743\",\"sQSM\":\"Y\",\"tKSJ\":\"20231213\",\"xSF_MC\":\"兖矿集团唐村实业有限公司\",\"xSF_NSRSBH\":\"913708831661200960\",\"xXBBH\":\"3708832312005653\",\"xXBLX\":\"0\",\"xXBZT\":\"TZD0000\",\"yFP_DM\":\"0000000000\",\"yFP_HM\":\"00000000\",\"yYSBZ\":\"0000000000\",\"zTMS\":\"审核通过\"}}],\"sUCCESS_COUNT\":\"1\"}";
+ FgRedInvoiceDownloadReqNew fgRedInvoiceDownloadReqBO = JSONObject.parseObject(data, FgRedInvoiceDownloadReqNew.class);
+
+ boolean success = false;
+ if(ObjectUtil.isNotNull(fgRedInvoiceDownloadReqBO) && ObjectUtil.isNotEmpty(fgRedInvoiceDownloadReqBO.getRED_INVOICE_FORM_DOWNLOADS())){
+ success = true;
+ }
+ }
}
diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java
index 1cf30350..b6b5377f 100644
--- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java
+++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java
@@ -597,7 +597,7 @@ public class HttpInvoiceRequestUtil {
InvoiceRequestParam invoiceRequestParam = requestNewSk(url, reqData.getNSRSBH(), reqData.getKPJH(), terminalCode,
JsonUtils.getInstance().toJsonString(redInfoDownloadRequest), "红字信息表下载的接口", "");
if (ConfigureConstant.STRING_0000.equals(invoiceRequestParam.getReturnCode())) {
- RedInfoDownloadResponse redInfoDownloadResponse = JsonUtils.getInstance().parseObject(invoiceRequestParam.getData(), RedInfoDownloadResponse.class);
+ RedInfoDownloadResponse redInfoDownloadResponse = JSONObject.parseObject(invoiceRequestParam.getData(), RedInfoDownloadResponse.class);
if(ObjectUtil.isNotNull(redInfoDownloadResponse)){
hpResponseExtend = getHpResponseBean(redInfoDownloadResponse);
@@ -3006,7 +3006,6 @@ public class HttpInvoiceRequestUtil {
}
return response;
}
-
private static InvoiceRequestParam requestNewSk(String url, String nsrsbh, String fjh, String terminalCode,
String requestStr, String interfaceLog, String callChainId) throws Exception {
if (StringUtils.isBlank(callChainId)) {