Merge branch 'dev-blbzd' into test

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<String> shList);
 
-    List<OrderProcessInfo> queryOrderProcessInfoByBzdh(@Param("bzdh") String bzdh,  @Param("shList")List<String> shList);
+    List<OrderProcessInfo> queryOrderProcessInfoByBzdh(@Param("bzdh") String bzdh,String zfbz,  @Param("shList")List<String> shList);
 
     List<OrderProcessInfo> queryOrderProcessInfoByBzdhs(@Param("bzdhs") List<String> bzdhs,  @Param("shList")List<String> shList);
 

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<GsClient> 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<OrderProcessInfo> orderProcessInfos = orderProcessService.queryOrderProcessInfoByBzdh(orderProcessInfo.getBzdh(), shList);
+            List<OrderProcessInfo> 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;

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<String> shList);
 
-    List<OrderProcessInfo> queryOrderProcessInfoByBzdh(String bzdh, List<String> shList);
+    List<OrderProcessInfo> queryOrderProcessInfoByBzdh(String bzdh,String zfbz, List<String> shList);
 
     /**
      * 根据订单请求批次号获取发票处理表数据

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<OrderProcessInfo> orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh, Arrays.asList(xhfNsrsbh));
+        List<OrderProcessInfo> orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh,"", Arrays.asList(xhfNsrsbh));
         OrderProcessInfo orderProcessInfo = null;
         if(orderProcessInfos.size() > 1){
             throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_MULTIPLE);

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<OrderProcessInfo> queryOrderProcessInfoByBzdh(String bzdh, List<String> shList){
-        return orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh, shList);
+    public List<OrderProcessInfo> queryOrderProcessInfoByBzdh(String bzdh,String zfbz, List<String> shList){
+        return orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh,zfbz, shList);
     }
     
     @Override

order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml

@@ -169,7 +169,9 @@
             </foreach>
         </if>
         and op.order_status = '0'
-        and oii.zf_bz = '0'
+        <if test="zfbz != null and zfbz != ''">
+            and oii.zf_bz = '0'
+        </if>
     </select>
 
     <select id="queryOrderProcessInfoByBzdhs" parameterType="java.lang.String" resultMap="BaseResultMap">