diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java index cb349596..843b2af1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java @@ -51,7 +51,7 @@ public interface OrderProcessInfoMapper { */ OrderProcessInfo queryOrderProcessInfoByFpqqlsh(@Param("fpqqlsh") String fpqqlsh, @Param("shList") List shList); - List queryOrderProcessInfoByBzdh(@Param("bzdh") String bzdh, @Param("shList")List shList); + List queryOrderProcessInfoByBzdh(@Param("bzdh") String bzdh,String zfbz, @Param("shList")List shList); List queryOrderProcessInfoByBzdhs(@Param("bzdhs") List bzdhs, @Param("shList")List shList); 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 c6a2a52b..ef675333 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 @@ -1624,7 +1624,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { List gsClients = gsClientMapper.selectByGsdm(orderProcessInfo.getGsdm()); log.info("{}推送接口orderProcessInfo数据:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderProcessInfo)); if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly()) && new BigDecimal(orderProcessInfo.getKphjje()).compareTo(BigDecimal.ZERO) > 0){ - List orderProcessInfos = orderProcessService.queryOrderProcessInfoByBzdh(orderProcessInfo.getBzdh(), shList); + List orderProcessInfos = orderProcessService.queryOrderProcessInfoByBzdh(orderProcessInfo.getBzdh(),"0", shList); int count = (int)orderProcessInfos.stream().filter(t ->OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt())).count(); if(orderProcessInfos.size() != count){ return null; diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java index 9a3eb18a..bedec5f1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java @@ -32,7 +32,7 @@ public interface OrderProcessService { */ OrderProcessInfo queryOrderProcessInfoByFpqqlsh(String fpqqlsh, List shList); - List queryOrderProcessInfoByBzdh(String bzdh, List shList); + List queryOrderProcessInfoByBzdh(String bzdh,String zfbz, List shList); /** * 根据订单请求批次号获取发票处理表数据 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 074f8168..c0785395 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1754,7 +1754,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { @Override public void updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh) throws Exception{ //通过报账单查询订单,如果存在则删除 - List orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh, Arrays.asList(xhfNsrsbh)); + List orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh,"", Arrays.asList(xhfNsrsbh)); OrderProcessInfo orderProcessInfo = null; if(orderProcessInfos.size() > 1){ throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_MULTIPLE); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java index 6073cd53..52ff8b0a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java @@ -66,8 +66,8 @@ public class OrderProcessServiceImpl implements OrderProcessService { } @Override - public List queryOrderProcessInfoByBzdh(String bzdh, List shList){ - return orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh, shList); + public List queryOrderProcessInfoByBzdh(String bzdh,String zfbz, List shList){ + return orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh,zfbz, shList); } @Override diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index 5728dd5c..64f2cf23 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -169,7 +169,9 @@ and op.order_status = '0' - and oii.zf_bz = '0' + + and oii.zf_bz = '0' +