From e495ea99ccdac836bd25a45f40d83c77a65b445c Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Wed, 21 Jun 2023 12:34:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B4=AD=E6=96=B9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E4=B8=8D=E5=88=B0=E8=B7=B3=E8=BF=87=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 3371d5dc..a8f6744d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -269,7 +269,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { BuyerEntity buyerEntity = buyerMapper.queryBuyerInfoByGhfIdAndEntId(orderInfo.getGhfId(), orderInfo.getEntId()); if (buyerEntity == null) { log.error("{}查询原始订单客户信息为空，id为：{}", LOGGER_MSG, orderProcessInfo.getOrderInfoId()); - oderDetailInfo.setCheckBankFlag(OrderInfoEnum.CHECK_BANK_FLAG_YES.getKey()); + oderDetailInfo.setCheckBankFlag(OrderInfoEnum.CHECK_BANK_FLAG_NO.getKey()); } else { oderDetailInfo.setCheckBankFlag(buyerEntity.getCheckBankFlag()); } From 5447484a20b5f59741522baaf0ba81924c3de104 Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Wed, 21 Jun 2023 14:42:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=93=81?= =?UTF-8?q?=E6=B2=B9=E6=98=8E=E7=BB=86=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index 893cef57..959f0cc5 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -196,7 +196,7 @@ public class InvoiceServiceImpl implements InvoiceService { } } if(CollectionUtils.isEmpty(cpyOrderItems)||CollectionUtils.isEmpty(nocpyOrderItems)){ - commonOrderInfo.setOrderItemInfo(CollectionUtils.isEmpty(cpyOrderItems)?nocpyOrderItems:nocpyOrderItems); + commonOrderInfo.setOrderItemInfo(CollectionUtils.isEmpty(cpyOrderItems)?nocpyOrderItems:cpyOrderItems); commonOrderInfoList.add(commonOrderInfo); }else { //封装成品油 From 32e790b7e878681db91aec66f1277a99e86c3ab1 Mon Sep 17 00:00:00 2001 From: gaorl Date: Sun, 25 Jun 2023 09:41:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feature=EF=BC=9A=E7=94=B5=E5=95=8602?= =?UTF-8?q?=E5=9B=9E=E6=8E=A8=E6=B7=BB=E5=8A=A0=E8=AF=B7=E6=B1=82=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/baseservice/config/BaseServiceConfig.java | 3 +++ .../src/main/java/com/dxhy/order/utils/HttpUtils.java | 10 ++++++++++ .../manager/service/impl/PushInvoiceServiceImpl.java | 4 +++- 3 files changed, 16 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 1263138d..d1a12c86 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 @@ -289,6 +289,9 @@ public class BaseServiceConfig{ @Value("${order.push.po.url:}") private String poUrl; + @Value("${order.push.po.ecKey:}") + private String ecKey; + /** * 调用山能PO username */ diff --git a/order-management-common/src/main/java/com/dxhy/order/utils/HttpUtils.java b/order-management-common/src/main/java/com/dxhy/order/utils/HttpUtils.java index 2f1713be..88af072c 100644 --- a/order-management-common/src/main/java/com/dxhy/order/utils/HttpUtils.java +++ b/order-management-common/src/main/java/com/dxhy/order/utils/HttpUtils.java @@ -78,6 +78,16 @@ public class HttpUtils { log.debug("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime); return body; } + + public static String sendPoWithHead(String url, String request,String userName,String password,Map header) { + long startTime = System.currentTimeMillis(); + HttpRequest httpRequest = new HttpRequest(url); + httpRequest.basicAuth(userName,password); + String body = httpRequest.addHeaders(header).body(request).timeout(300000).execute().body(); + long endTime = System.currentTimeMillis(); + log.debug("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime); + return body; + } /** * 上传文件 * 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 92ec0d57..b8fa00a2 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 @@ -441,7 +441,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { result = HttpUtils.sendPo(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword()); } else if (OrderInfoEnum.SYS_SOURCE_DSXT02.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("ec-key",baseServiceConfig.getEcKey()); + result = HttpUtils.sendPoWithHead(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword(),map); } } else { result = HttpUtils.doPost(pushInfo.getPushUrl(), requestMap);