From 11034e4357cddfcc70605f60d3321d254006d5f7 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 25 Jul 2023 13:43:45 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD=E6=98=93?= =?UTF-8?q?=E8=A1=8C=E5=9B=9E=E6=8E=A8=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 --- .../com/dxhy/order/baseservice/config/BaseServiceConfig.java | 2 ++ .../modules/manager/service/impl/PushInvoiceServiceImpl.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseServiceConfig.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseServiceConfig.java index d1a12c86..9c8e7fed 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseServiceConfig.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseServiceConfig.java @@ -292,6 +292,8 @@ public class BaseServiceConfig{ @Value("${order.push.po.ecKey:}") private String ecKey; + @Value("${order.push.yx.ecKey:}") + private String yxKey; /** * 调用山能PO username */ diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index 43458df3..a35c4b2d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -447,7 +447,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { result = HttpUtils.sendPoWithHead(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword(),map); } else if (OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly()) && StringUtils.isNotBlank(pushInfo.getByzd1()) && pushInfo.getByzd1().equals(orderProcessInfo.getXtly())) { - result = HttpUtils.sendPo(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword()); + Map map = Maps.newHashMap(); + map.put("authorization",baseServiceConfig.getYxKey()); + result = HttpUtils.sendPoWithHead(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword(),map); } } else { result = HttpUtils.doPost(pushInfo.getPushUrl(), requestMap);