From 8839838652e0f88bd6e689704d3c9a40ae691331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=90=A6?= Date: Mon, 23 Oct 2023 09:49:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=91=9E=E4=B8=B0=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/order/constant/OrderInfoEnum.java | 4 ++++ .../order/consumer/openapi/api/InvoiceOpenGateRestApi.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 140f52ed..224b0233 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 @@ -1277,6 +1277,10 @@ public enum OrderInfoEnum { INTERFACE_BUSINESS_ID_FPKJTS("FI843","发票开具回推"), INTERFACE_BUSINESS_ID_FPKJ("FI840","发票开具"), INTERFACE_BUSINESS_SNYX_FPKJ("FI883","发票开具"), + /** + * 瑞丰发票开具接口 + */ + INTERFACE_BUSINESS_RF_FPKJ("FI1010","发票开具"), INTERFACE_BUSINESS_ID_FPZFTS("FI844","发票作废回推"), INTERFACE_BUSINESS_ID_GSCLIENT("FI846","获取公司client"), INTERFACE_BUSINESS_ID_DDZTGX("FI841","订单状态更新"), diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java index 6e602c10..6ad30cc5 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java @@ -79,7 +79,8 @@ public class InvoiceOpenGateRestApi { PoCommonRequestParam requestParam = JsonUtils.getInstance().parseObject(param, PoCommonRequestParam.class); String interfaceName = ""; if(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPKJ.getKey().equals(requestParam.getIS_INPUT().getIFYWID()) - ||OrderInfoEnum.INTERFACE_BUSINESS_SNYX_FPKJ.getKey().equals(requestParam.getIS_INPUT().getIFYWID())){ + ||OrderInfoEnum.INTERFACE_BUSINESS_SNYX_FPKJ.getKey().equals(requestParam.getIS_INPUT().getIFYWID()) + ||OrderInfoEnum.INTERFACE_BUSINESS_RF_FPKJ.getKey().equals(requestParam.getIS_INPUT().getIFYWID())){ interfaceName = ConfigurerInfo.GENERATE_QD_INVOICE; }else if(OrderInfoEnum.INTERFACE_BUSINESS_ID_DDZTGX.getKey().equals(requestParam.getIS_INPUT().getIFYWID())){ interfaceName = ConfigurerInfo.ORDER_STATUS_UPDATE; From 930a152909d2c9f24a8aaad7352acdf59a3f8f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=90=A6?= Date: Fri, 24 Nov 2023 15:40:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=91=9E=E4=B8=B0=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/order/consumer/utils/BeanTransitionUtils.java | 1 + .../src/main/resources/bootstrap-test.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 2384fa01..e6dbd347 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3552,6 +3552,7 @@ public class BeanTransitionUtils { ddtxxBO.setPZGZRQ(req.getZGZRQ()); ddtxxBO.setYZFP(ConfigureConstant.STRING_0); ddtxxBO.setORIGINDDH(req.getZJSDH()); + ddtxxBO.setBZ(req.getZZBZ()); ddtxxBO.setKB(ObjectUtil.isNull(req.getITITEM().get(0).getKTYPE())?"":req.getITITEM().get(0).getKTYPE()+(ObjectUtil.isNull(req.getITITEM().get(0).getKNAME())?"":req.getITITEM().get(0).getKNAME())); //清单标志先赋值成0，没有农产品业务，成品油的人工拆分出来做处理 ddtxxBO.setQDBZ("0"); diff --git a/order-management-consumer/src/main/resources/bootstrap-test.yaml b/order-management-consumer/src/main/resources/bootstrap-test.yaml index c898984e..ece2d479 100644 --- a/order-management-consumer/src/main/resources/bootstrap-test.yaml +++ b/order-management-consumer/src/main/resources/bootstrap-test.yaml @@ -4,14 +4,14 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 172.31.36.143:33000 - #server-addr: 172.31.36.147:33000 +# server-addr: 172.31.36.143:33000 + server-addr: 172.31.36.146:33000 # Nacos config 命名空间,对应配置中的名称(sims_order_namespace) namespace: a049b41c-b0a8-4a66-91b1-f3f3cab0e524 # Nacos config 分组 group: sims-order-config # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 password: Invoice.nacos.!1 # Nacos config 配置文件前缀 @@ -54,7 +54,7 @@ spring: # Nacos discovery 配置 discovery: # Nacos discovery 服务地址 - server-addr: 172.31.36.143:33000 + server-addr: 172.31.36.146:33000 #Nacos config 命名空间,对应配置中的名称(sims_order_namespace) namespace: ${spring.cloud.nacos.config.namespace} # Nacos config 登录用户名