canrd-outside / order-erp · Commits

Commit 927a715a871e6973f86ecfcd21965488e2723b7c

Authored by 谢茂盛
2 parents 180eea36 977d2c69
build: skipped

Merge remote-tracking branch 'origin/dev_finance_20240830' into test

Inline Side-by-side
Showing 1 changed file with 9 additions and 4 deletions
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
  View file @927a715
@@ -93,15 +93,20 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl<InvoiceBillOrderMap @@ -93,15 +93,20 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl<InvoiceBillOrderMap
93 * @return 93 * @return
94 */ 94 */
95 private LambdaQueryWrapper<InvoiceBillOrderDO> getQueryWrapper(InvoiceBillOrderQueryVO queryVO) { 95 private LambdaQueryWrapper<InvoiceBillOrderDO> getQueryWrapper(InvoiceBillOrderQueryVO queryVO) {
96 - Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO);  
97 - return new LambdaQueryWrapper<InvoiceBillOrderDO>() 96 + LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = new LambdaQueryWrapper<InvoiceBillOrderDO>()
98 .eq(InvoiceBillOrderDO::getEnableFlag, Constant.ENABLE_TEN) 97 .eq(InvoiceBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
99 - .in(CollectionUtils.isNotEmpty(billOrderIds), InvoiceBillOrderDO::getId, billOrderIds)  
100 .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), InvoiceBillOrderDO::getInvoiceNo, queryVO.getInvoiceNo()) 98 .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), InvoiceBillOrderDO::getInvoiceNo, queryVO.getInvoiceNo())
101 .eq(Objects.nonNull(queryVO.getStatus()), InvoiceBillOrderDO::getStatus, queryVO.getStatus()) 99 .eq(Objects.nonNull(queryVO.getStatus()), InvoiceBillOrderDO::getStatus, queryVO.getStatus())
102 .ge(StringUtils.isNotBlank(queryVO.getStartTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getStartTime()) 100 .ge(StringUtils.isNotBlank(queryVO.getStartTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getStartTime())
103 .le(StringUtils.isNotBlank(queryVO.getEndTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getEndTime()) 101 .le(StringUtils.isNotBlank(queryVO.getEndTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getEndTime())
104 .orderByDesc(InvoiceBillOrderDO::getId); 102 .orderByDesc(InvoiceBillOrderDO::getId);
  103 + if (CollectionUtils.isNotEmpty(queryVO.getIds())) {
  104 + queryWrapper.in(InvoiceBillOrderDO::getId, queryVO.getIds());
  105 + } else {
  106 + Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO);
  107 + queryWrapper.in(CollectionUtils.isNotEmpty(billOrderIds), InvoiceBillOrderDO::getId, billOrderIds);
  108 + }
  109 + return queryWrapper;
105 } 110 }
106 111
107 @Override 112 @Override
@@ -569,7 +574,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap @@ -569,7 +574,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
569 throw new BusinessException("存在相同的invoice订单！"); 574 throw new BusinessException("存在相同的invoice订单！");
570 } 575 }
571 576
572 - List<InvoiceBillMappingDO> invoiceBillMappingDOList = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag,Constant.ENABLE_TEN).in(InvoiceBillMappingDO::getOrderId,createVO.getOrderIds())); 577 + List<InvoiceBillMappingDO> invoiceBillMappingDOList = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(InvoiceBillMappingDO::getOrderId, createVO.getOrderIds()));
573 if (CollectionUtils.isNotEmpty(invoiceBillMappingDOList)) { 578 if (CollectionUtils.isNotEmpty(invoiceBillMappingDOList)) {
574 throw new BusinessException("该勾选的订单已经绑定其他账单了！"); 579 throw new BusinessException("该勾选的订单已经绑定其他账单了！");
575 } 580 }