From 660e8049cdfd6730ec38e0978cbaaefb7c0bbe56 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sun, 5 Jul 2026 10:14:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(order):=20=E4=BF=AE=E5=A4=8D=E5=90=88?= =?UTF-8?q?=E5=90=8CID=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修正了销售异议查询中的订单ID参数错误 - 修正了应收账款查询中的订单ID参数错误 - 修正了运单查询中的订单ID参数错误 - 简化了合同ID直接查询逻辑，移除冗余订单查询步骤 - 修复了线圈材料查询中的订单ID条件错误 --- .../service/impl/CrmOrderItemServiceImpl.java | 29 +++---------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java index f0f26b4ae..9a493a3d2 100644 --- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java +++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java @@ -259,30 +259,18 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService { public CrmContractOrderFinanceVo queryFinanceAndObjectionByContractId(Long contractId) { CrmContractOrderFinanceVo result = new CrmContractOrderFinanceVo(); - LambdaQueryWrapper orderWrapper = new LambdaQueryWrapper<>(); - orderWrapper.eq(CrmOrder::getContractId, contractId); - List orders = crmOrderMapper.selectList(orderWrapper); - - if (orders == null || orders.isEmpty()) { - return result; - } - - List orderIds = orders.stream() - .map(CrmOrder::getOrderId) - .collect(Collectors.toList()); - LambdaQueryWrapper objectionWrapper = new LambdaQueryWrapper<>(); - objectionWrapper.in(CrmSalesObjection::getOrderId, orderIds); + objectionWrapper.in(CrmSalesObjection::getOrderId, contractId); List objectionList = crmSalesObjectionMapper.selectVoList(objectionWrapper); result.setObjectionList(objectionList); LambdaQueryWrapper receivableWrapper = new LambdaQueryWrapper<>(); - receivableWrapper.in(WmsReceivable::getOrderId, orderIds); + receivableWrapper.in(WmsReceivable::getOrderId, contractId); List receivableList = wmsReceivableMapper.selectVoList(receivableWrapper); result.setReceivableList(receivableList); LambdaQueryWrapper waybillWrapper = new LambdaQueryWrapper<>(); - waybillWrapper.in(WmsDeliveryWaybill::getOrderId, orderIds); + waybillWrapper.in(WmsDeliveryWaybill::getOrderId, contractId); List wmsDeliveryWaybills = wmsDeliveryWaybillMapper.selectVoList(waybillWrapper); result.setWmsDeliveryWaybills(wmsDeliveryWaybills); @@ -442,18 +430,9 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService { @Override public List queryCoilsByContractId(Long contractId) { - LambdaQueryWrapper orderWrapper = new LambdaQueryWrapper<>(); - orderWrapper.eq(CrmOrder::getContractId, contractId); - List orders = crmOrderMapper.selectList(orderWrapper); - if (orders == null || orders.isEmpty()) { - return Collections.emptyList(); - } - List orderIds = orders.stream() - .map(CrmOrder::getOrderId) - .collect(Collectors.toList()); LambdaQueryWrapper waybillWrapper = new LambdaQueryWrapper<>(); - waybillWrapper.in(WmsDeliveryWaybill::getOrderId, orderIds); + waybillWrapper.eq(WmsDeliveryWaybill::getOrderId, contractId); List waybills = wmsDeliveryWaybillMapper.selectList(waybillWrapper); if (waybills == null || waybills.isEmpty()) { return Collections.emptyList();