feature:1.邮箱推送去掉校验，2.定时任务去掉查询订单西悉尼

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<String> emailAddressList = StrUtil.split(emailAddress, ConfigureConstant.STRING_SEMICOLON);
 
             //验证邮箱合法性
-            for (String email : emailAddressList) {
+//            for (String email : emailAddressList) {
-                if (!Validator.isEmail(email)) {
+//                if (!Validator.isEmail(email)) {
-                    log.error("发票代码:{},发票号码:{},邮箱({})格式非法!", fpdm, fphm, email);
+//                    log.info("邮箱:{}格式非法", email);
-                    orderInvoiceInfoUpdate.setEmailPushStatus(OrderInfoEnum.EMAIL_PUSH_STATUS_0.getKey());
+//                    log.error("发票代码:{},发票号码:{},邮箱({})格式非法!", fpdm, fphm, email);
-                    orderInvoiceInfoUpdate.setEmailPushSbyy("邮箱格式非法不进行交付!");
+//                    orderInvoiceInfoUpdate.setEmailPushStatus(OrderInfoEnum.EMAIL_PUSH_STATUS_0.getKey());
-                    updateOrderInvoiceInfoByFpqqlsh(orderInvoiceInfoUpdate, shList);
+//                    orderInvoiceInfoUpdate.setEmailPushSbyy("邮箱格式非法不进行交付!");
-                    return R.error(String.format("发票代码:%s,发票号码:%s,邮箱(%s)格式非法不进行交付!", fpdm, fphm, email));
+//                    updateOrderInvoiceInfoByFpqqlsh(orderInvoiceInfoUpdate, shList);
-                }
+//                    return R.error(String.format("发票代码:%s,发票号码:%s,邮箱(%s)格式非法不进行交付!", fpdm, fphm, email));
-            }
+//                }
+//            }
 
 
             //组装邮箱发送bean

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<OrderInvoiceInfo> 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));