From 9746e275a7b95a8784de0e916ca21f487d2104da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 2 Sep 2024 18:04:32 +0800 Subject: [PATCH] =?UTF-8?q?feature:1.=E9=82=AE=E7=AE=B1=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=A1=E9=AA=8C=EF=BC=8C2.=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=8E=BB=E6=8E=89=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=A5=BF=E6=82=89=E5=B0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OrderInvoiceInfoServiceImpl.java | 19 ++++++++++--------- .../impl/OrderPushInvoiceServiceImpl.java | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java index 4f468d9..811bd42 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java @@ -1996,15 +1996,16 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { List emailAddressList = StrUtil.split(emailAddress, ConfigureConstant.STRING_SEMICOLON); //验证邮箱合法性 - for (String email : emailAddressList) { - if (!Validator.isEmail(email)) { - log.error("发票代码:{},发票号码:{},邮箱({})格式非法!", fpdm, fphm, email); - orderInvoiceInfoUpdate.setEmailPushStatus(OrderInfoEnum.EMAIL_PUSH_STATUS_0.getKey()); - orderInvoiceInfoUpdate.setEmailPushSbyy("邮箱格式非法不进行交付!"); - updateOrderInvoiceInfoByFpqqlsh(orderInvoiceInfoUpdate, shList); - return R.error(String.format("发票代码:%s,发票号码:%s,邮箱(%s)格式非法不进行交付!", fpdm, fphm, email)); - } - } +// for (String email : emailAddressList) { +// if (!Validator.isEmail(email)) { +// log.info("邮箱:{}格式非法", email); +// log.error("发票代码:{},发票号码:{},邮箱({})格式非法!", fpdm, fphm, email); +// orderInvoiceInfoUpdate.setEmailPushStatus(OrderInfoEnum.EMAIL_PUSH_STATUS_0.getKey()); +// orderInvoiceInfoUpdate.setEmailPushSbyy("邮箱格式非法不进行交付!"); +// updateOrderInvoiceInfoByFpqqlsh(orderInvoiceInfoUpdate, shList); +// return R.error(String.format("发票代码:%s,发票号码:%s,邮箱(%s)格式非法不进行交付!", fpdm, fphm, email)); +// } +// } //组装邮箱发送bean diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/OrderPushInvoiceServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/OrderPushInvoiceServiceImpl.java index d93034c..e2f3793 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/OrderPushInvoiceServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/OrderPushInvoiceServiceImpl.java @@ -1161,14 +1161,14 @@ public class OrderPushInvoiceServiceImpl implements OrderPushInvoiceService { List orderInvoiceInfoList = orderInvoiceInfoService.selectInvoiceInfoByPushStatus(paraMap, shList); for (OrderInvoiceInfo orderInvoiceInfo : orderInvoiceInfoList) { - OrderInfo orderInfo = orderInfoService.queryOrderInfoByFpqqlsh(orderInvoiceInfo.getFpqqlsh(), shList); +// OrderInfo orderInfo = orderInfoService.queryOrderInfoByFpqqlsh(orderInvoiceInfo.getFpqqlsh(), shList); //如果购买方邮箱为空时，推送数据不放入邮箱推送队列 //发票邮箱交付请求数据组装 FpYxTsMqData fpYxTsMqData = new FpYxTsMqData(); fpYxTsMqData.setShList(shList); fpYxTsMqData.setFpqqlsh(orderInvoiceInfo.getFpqqlsh()); - fpYxTsMqData.setEmailAddress(orderInfo.getGhfEmail()); +// fpYxTsMqData.setEmailAddress(orderInfo.getGhfEmail()); fpYxTsMqData.setPushType(OrderInfoEnum.EMAIL_PUSH_TYPE_1.getKey()); log.info("发票版式文件邮箱推送，放入队列的参数:{}", JsonUtils.getInstance().toJsonString(fpYxTsMqData));