Merge branch 'test' of http://39.108.227.113:8001/xiemaosheng2/order-erp into ch

chenhang4442024
2 parents fbfd37bd 927a715a
Showing 1 changed file with 12 additions and 4 deletions
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
@@ -93,15 +93,20 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      * @return
      */
     private LambdaQueryWrapper<InvoiceBillOrderDO> getQueryWrapper(InvoiceBillOrderQueryVO queryVO) {
-        Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO);
-        return new LambdaQueryWrapper<InvoiceBillOrderDO>()
+        LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = new LambdaQueryWrapper<InvoiceBillOrderDO>()
                 .eq(InvoiceBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
-                .in(CollectionUtils.isNotEmpty(billOrderIds), InvoiceBillOrderDO::getId, billOrderIds)
                 .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), InvoiceBillOrderDO::getInvoiceNo, queryVO.getInvoiceNo())
                 .eq(Objects.nonNull(queryVO.getStatus()), InvoiceBillOrderDO::getStatus, queryVO.getStatus())
                 .ge(StringUtils.isNotBlank(queryVO.getStartTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getStartTime())
                 .le(StringUtils.isNotBlank(queryVO.getEndTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getEndTime())
                 .orderByDesc(InvoiceBillOrderDO::getId);
+        if (CollectionUtils.isNotEmpty(queryVO.getIds())) {
+            queryWrapper.in(InvoiceBillOrderDO::getId, queryVO.getIds());
+        } else {
+            Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO);
+            queryWrapper.in(CollectionUtils.isNotEmpty(billOrderIds), InvoiceBillOrderDO::getId, billOrderIds);
+        }
+        return queryWrapper;
     }
     @Override
@@ -474,6 +479,9 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(SystemSettingDO::getSettingCode, "customerCode").eq(SystemSettingDO::getSettingValue, customerCode)
                 .eq(SystemSettingDO::getRelationCode, "orderHodTime").last("limit 1"));
+        if (Objects.isNull(systemSettingDO)) {
+            return Constant.ZERO;
+        }
         String holdTime = systemSettingDO.getRelationValue();
         return StringUtils.isBlank(holdTime) ? Constant.ZERO : Integer.parseInt(holdTime);
     }
@@ -566,7 +574,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
             throw new BusinessException("存在相同的invoice订单！");
         }
-        List<InvoiceBillMappingDO> invoiceBillMappingDOList = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag,Constant.ENABLE_TEN).in(InvoiceBillMappingDO::getOrderId,createVO.getOrderIds()));
+        List<InvoiceBillMappingDO> invoiceBillMappingDOList = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(InvoiceBillMappingDO::getOrderId, createVO.getOrderIds()));
         if (CollectionUtils.isNotEmpty(invoiceBillMappingDOList)) {
             throw new BusinessException("该勾选的订单已经绑定其他账单了！");
         }