canrd-outside / order-erp · Commits

Commit f924d5a89ccc5e9a47da8df1810c7ef09601a291

Authored by chenhang4442024
2 parents fbfd37bd 927a715a
build: skipped

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

Inline Side-by-side
Showing 1 changed file with 12 additions and 4 deletions
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
  View file @f924d5a
... ... @@ -93,15 +93,20 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl<InvoiceBillOrderMap
93 93 * @return
94 94 */
95 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 97 .eq(InvoiceBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
99   - .in(CollectionUtils.isNotEmpty(billOrderIds), InvoiceBillOrderDO::getId, billOrderIds)
100 98 .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), InvoiceBillOrderDO::getInvoiceNo, queryVO.getInvoiceNo())
101 99 .eq(Objects.nonNull(queryVO.getStatus()), InvoiceBillOrderDO::getStatus, queryVO.getStatus())
102 100 .ge(StringUtils.isNotBlank(queryVO.getStartTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getStartTime())
103 101 .le(StringUtils.isNotBlank(queryVO.getEndTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getEndTime())
104 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 112 @Override
... ... @@ -474,6 +479,9 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
474 479 SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
475 480 .eq(SystemSettingDO::getSettingCode, "customerCode").eq(SystemSettingDO::getSettingValue, customerCode)
476 481 .eq(SystemSettingDO::getRelationCode, "orderHodTime").last("limit 1"));
  482 + if (Objects.isNull(systemSettingDO)) {
  483 + return Constant.ZERO;
  484 + }
477 485 String holdTime = systemSettingDO.getRelationValue();
478 486 return StringUtils.isBlank(holdTime) ? Constant.ZERO : Integer.parseInt(holdTime);
479 487 }
... ... @@ -566,7 +574,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
566 574 throw new BusinessException("存在相同的invoice订单！");
567 575 }
568 576  
569   - 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()));
570 578 if (CollectionUtils.isNotEmpty(invoiceBillMappingDOList)) {
571 579 throw new BusinessException("该勾选的订单已经绑定其他账单了！");
572 580 }
... ...