diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/ConfigurerInfo.java b/order-management-common/src/main/java/com/dxhy/order/constant/ConfigurerInfo.java index 5b451b1d..35cd19eb 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/ConfigurerInfo.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/ConfigurerInfo.java @@ -109,6 +109,10 @@ public class ConfigurerInfo { * V6版本全电开票接口 */ public static final String GENERATE_QD_INVOICE = "GenerateQdInvoice"; + /** + * 订单驳回状态更新接口 (销售结算报账单的驳回状态传给发票系统(ERP-FI-INT-046)) + */ + public static final String ORDER_STATUS_UPDATE = "OrderStatusUpdate"; /** * 请求执行状态查询接口 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 6ece7b1a..33ff4ee1 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 @@ -249,7 +249,12 @@ public class InvoiceRestApiV6 { HzqrdRspV6 hzqrdRspV6 = interfaceServiceV6.processRedConfirmation(interfaceName, reqStr); returnJsonString = JsonUtils.getInstance().toJsonStringNullToEmpty(hzqrdRspV6); - } else { + } else if (ConfigurerInfo.ORDER_STATUS_UPDATE.equals(interfaceName)){ + //订单驳回状态更新接口-(销售结算报账单的驳回状态传给发票系统(ERP-FI-INT-046)) + PoCommonRequestParam requestParam = JsonUtils.getInstance().parseObject(reqStr, PoCommonRequestParam.class); + PoCommonResponseParam poCommonResponseParam = interfaceServiceV6.updateOrderStatus(requestParam, secretId); + returnJsonString = JsonUtils.getInstance().toJsonString(poCommonResponseParam); + }else { returnJsonString = ""; } return returnJsonString; diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/InterfaceServiceV6.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/InterfaceServiceV6.java index fdc6f2c2..6e290f82 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/InterfaceServiceV6.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/InterfaceServiceV6.java @@ -1,5 +1,7 @@ package com.dxhy.order.consumer.openapi.service; +import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam; +import com.dxhy.order.consumer.openapi.protocol.po.PoCommonResponseParam; import com.dxhy.order.consumer.openapi.protocol.v4.order.DdpcxxReqBO; import com.dxhy.order.consumer.openapi.protocol.v5.order.DdpcxxRspV5; import com.dxhy.order.consumer.openapi.protocol.v6.hzqrd.HzqrdRspV6; @@ -28,4 +30,13 @@ public interface InterfaceServiceV6 { * @return */ HzqrdRspV6 processRedConfirmation(String interfaceName ,String reqParam); + + /** + * @Description: 订单驳回状态更新接口-(销售结算报账单的驳回状态传给发票系统(ERP-FI-INT-046)) + * @Param: [requestParam, secretId] + * @Return: com.dxhy.order.consumer.openapi.protocol.po.PoCommonResponseParam + * @Author: liufeilong + * @Date: 2023-02-08 + */ + PoCommonResponseParam updateOrderStatus(PoCommonRequestParam requestParam, String secretId); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java index 1e612f14..85a013ea 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java @@ -4,6 +4,9 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.dxhy.order.constant.*; +import com.dxhy.order.consumer.openapi.protocol.po.EsOutput; +import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam; +import com.dxhy.order.consumer.openapi.protocol.po.PoCommonResponseParam; import com.dxhy.order.consumer.openapi.protocol.v4.order.DdpcxxReqBO; import com.dxhy.order.consumer.openapi.protocol.v4.order.DdpcxxRspBO; import com.dxhy.order.consumer.openapi.protocol.v5.order.DdpcxxRspV5; @@ -74,6 +77,18 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 { } } + @Override + public PoCommonResponseParam updateOrderStatus(PoCommonRequestParam requestParam, String secretId) { + PoCommonResponseParam poCommonResponseParam = new PoCommonResponseParam(); + EsOutput esOutput = new EsOutput(); + esOutput.setBSKEY(""); + esOutput.setSAPKEY(""); + esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey()); + esOutput.setZMESSAGE(""); + poCommonResponseParam.setES_OUTPUT(esOutput); + return poCommonResponseParam; + } + private HzqrdRspV6 queryRedConfirmationList(String reqUrl, String reqParam, String logName){ HzqrdRspV6 hzqrdRspV6 = new HzqrdRspV6(); hzqrdRspV6.setZTDM(InterfaceEnum.INTERFACE_V5_STATUS_009999.getKey());