feature：全电发票开具未推送影像系统

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java

@@ -1766,7 +1766,12 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
         resultToyxVo.setBuyerName(orderInvoiceInfo.getGhfMc());
         resultToyxVo.setSellerName(orderInvoiceInfo.getXhfMc());
         String terminalCode = orderInvoiceInfo.getSksbdm();
-        if(OrderInfoEnum.ORDER_INVOICE_TYPE_51.getValue().equals(orderInvoiceInfo.getFpzlDm()) || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getValue().equals(orderInvoiceInfo.getFpzlDm())){
+        if(OrderInfoEnum.ORDER_INVOICE_TYPE_51.getValue().equals(orderInvoiceInfo.getFpzlDm())
+                || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getValue().equals(orderInvoiceInfo.getFpzlDm())
+                || OrderInfoEnum.ORDER_INVOICE_TYPE_01.getValue().equals(orderInvoiceInfo.getFpzlDm())
+                || OrderInfoEnum.ORDER_INVOICE_TYPE_02.getValue().equals(orderInvoiceInfo.getFpzlDm())
+
+        ){
             OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList);
             List<FileDownLoad> fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode,"");
             if (ObjectUtil.isNotEmpty(fileDownLoadList)) {

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java

@@ -981,7 +981,7 @@ public class OrderMergeServiceImpl implements OrderMergeService {
             }
             orderItemInfo.setCreateTime(new Date());
             orderItemInfo.setSe(se.toString());
-            if((termType && se.subtract(taxAmount).abs().doubleValue() > 0.01) || (!termType &&se.subtract(taxAmount).abs().doubleValue() > 0.06)){
+            if((termType && se.subtract(taxAmount).abs().doubleValue() > 0.01) || (!termType &&se.subtract(taxAmount).abs().doubleValue() > 0.05)){
                 log.info("订单id：{}合并明细误差超过额度",orderInfo.getId());
                 BigDecimal taxAndAmount = xmje.add(se);
                 BigDecimal taxAmountNew = taxAndAmount.divide(new BigDecimal("1").add(taxRate),0).multiply(taxRate).setScale(2,RoundingMode.HALF_UP);