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 d0e20937..c64a3631 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 @@ -230,7 +230,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { //推送票池 try { - if (StringUtils.isNotBlank(commonTsMqData.getFpTsMqData().getFpdm()) && StringUtils.isNotBlank(commonTsMqData.getFpTsMqData().getFphm())) { + if (StringUtils.isNotBlank(commonTsMqData.getFpTsMqData().getFphm())) { pushTicketPoolService.pushTicketPool(commonTsMqData.getFpTsMqData().getFpdm(), commonTsMqData.getFpTsMqData().getFphm(), commonTsMqData.getNsrsbh()); } @@ -251,7 +251,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { } //推送票池 try { - if (StringUtils.isNotBlank(commonTsMqData.getZfTsMqData().getFpdm()) && StringUtils.isNotBlank(commonTsMqData.getZfTsMqData().getFphm())) { + if (StringUtils.isNotBlank(commonTsMqData.getZfTsMqData().getFphm())) { pushTicketPoolService.pushTicketPool(commonTsMqData.getZfTsMqData().getFpdm(), commonTsMqData.getZfTsMqData().getFphm(), commonTsMqData.getNsrsbh()); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java index d1262ac0..b2dbd139 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java @@ -85,10 +85,10 @@ public class PushTicketPoolServiceImpl implements PushTicketPoolService { OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoMapper.selectOrderInvoiceInfo(orderInvoiceInfo1, shList); log.info("{}推送接口orderInvoiceInfo数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInvoiceInfo)); - if (ObjectUtil.isEmpty(orderInvoiceInfo) || !OrderInfoEnum.INVOICE_STATUS_2.getKey().equals(orderInvoiceInfo.getKpzt())) { - log.warn("{}发票数据不存在,或者发票状态不是开票中,数据不进行推送", LOGGER_MSG); - return R.ok(); - } +// if (ObjectUtil.isEmpty(orderInvoiceInfo) || !OrderInfoEnum.INVOICE_STATUS_2.getKey().equals(orderInvoiceInfo.getKpzt())) { +// log.warn("{}发票数据不存在,或者发票状态不是开票中,数据不进行推送", LOGGER_MSG); +// return R.ok(); +// } if (ConfigureConstant.STRING_Y.equals(openApiConfig.configPushTicketPoolStatus())) {