diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java index d6612878..87cbe967 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java @@ -1255,6 +1255,13 @@ public enum OrderInfoEnum { INTERFACE_BUSINESS_ID_FPZFTS("FI844","发票作废回推"), INTERFACE_BUSINESS_ID_DDZTGX("FI841","订单状态更新"), + /** + * 发票备注配置项枚举 + */ + INVOICE_REMARK_SET_JSDH("JSDH","结算单号"), + INVOICE_REMARK_SET_BZDH("BZDH","报账单号"), + INVOICE_REMARK_SET_KB("KB","矿别"), + ; diff --git a/order-management-consumer/pom.xml b/order-management-consumer/pom.xml index 2d3e186a..a5f9990f 100644 --- a/order-management-consumer/pom.xml +++ b/order-management-consumer/pom.xml @@ -244,12 +244,12 @@ - + junit diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index 221a0468..ca22d32e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -25,10 +25,8 @@ import com.dxhy.order.baseservice.openapi.protocol.qd.PageKpzzglRsp; import com.dxhy.order.baseservice.openapi.protocol.qd.PageXfxx; import com.dxhy.order.constant.*; import com.dxhy.order.consumer.config.OpenApiConfig; -import com.dxhy.order.consumer.modules.order.service.GenerateReadyOpenOrderService; -import com.dxhy.order.consumer.modules.order.service.OpenInvoiceService; -import com.dxhy.order.consumer.modules.order.service.OrderCommonService; -import com.dxhy.order.consumer.modules.order.service.OrderProcessService; +import com.dxhy.order.consumer.modules.order.model.InvoiceRemarkSet; +import com.dxhy.order.consumer.modules.order.service.*; import com.dxhy.order.consumer.modules.validate.service.ValidateInterfaceOrderService; import com.dxhy.order.consumer.modules.validate.service.ValidateOrderInfoService; import com.dxhy.order.consumer.openapi.protocol.v4.checklimit.RedisCheckLimit; @@ -131,6 +129,8 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt private UnifyService unifyService; @Resource private GroupManagementService groupManagementService; + @Resource + private InvoiceRemarkSetService invoiceRemarkSetService; /** * 发票开具接口 @@ -866,6 +866,29 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt itemInfo.setZnfm(""); itemInfo.setTswl(""); } + //根据配置拼接备注信息 + InvoiceRemarkSet invoiceRemarkSet = new InvoiceRemarkSet(); + invoiceRemarkSet.setGsbm(insertProcessInfo.get(0).getGsdm()); + invoiceRemarkSet.setStatus(ConfigureConstant.STRING_1); + List invoiceRemarkSets = invoiceRemarkSetService.queryRemarkSet(invoiceRemarkSet); + if(invoiceRemarkSets.size()>0){ + InvoiceRemarkSet en = invoiceRemarkSets.get(0); + log.info("{}结算单:{}查询到备注设置:{}",LOGGER_MSG,insertOrder.get(0).getDdh(),JsonUtils.getInstance().toJsonString(en)); + String mbnr = en.getMbnr(); + List mbnrList = Arrays.asList(mbnr.split("、")); + for(int i =0;i