Merge branch 'dev-snyx' into test

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

@@ -1601,15 +1601,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
         OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(fpTsMqData.getFpqqlsh(), shList);
         List<GsClient> gsClients = gsClientMapper.selectByGsdm(orderProcessInfo.getGsdm());
         log.info("{}推送接口orderProcessInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderProcessInfo));
-        if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly())){
+        if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly()) && new BigDecimal(orderProcessInfo.getKphjje()).compareTo(BigDecimal.ZERO) > 0){
             List<OrderProcessInfo> orderProcessInfos = orderProcessService.queryOrderProcessInfoByBzdh(orderProcessInfo.getBzdh(), shList);
-            int count = (int)orderProcessInfos.stream().filter(t ->{
-                if(new BigDecimal(orderProcessInfo.getKphjje()).compareTo(BigDecimal.ZERO) > 0){
-                    return OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt());
-                }else{
-                    return OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt());
-                }
-            }).count();
+            int count = (int)orderProcessInfos.stream().filter(t ->OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt())).count();
             if(orderProcessInfos.size() != count){
                 return null;
             }