判断调整

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/targetLog/TargetLogServiceImpl.java

@@ -183,12 +183,15 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
 
                     OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, info.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1"));
                     OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, info.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1"));
+                    if(info.getIsCargoControl()){
+                        customerId = info.getConsignorVO().getCustomerId();
+                    }else {
                         if(consignorDO !=null && ! consignorDO.getNoConsignee()  && !info.getHasConsignee()){//发货人档案设置控货无收货人且订单无收获人，归属发货人业绩 -- 层级2
                             if(consignorDO!=null){
                                 customerId = consignorDO.getId();
                             }
 
-                    }
+                        }else{
                             List<TargetOfferBackVO>  offerBackVOList =targetLogMapper.getTargetOfferBackByOrerId(orderId) ;
                             if (info.getDrawee() == 1) {//发货人付款
                                 if (info.getDrawee() == 1 && CollectionUtil.isNotEmpty(offerBackVOList)) {//如果是发货人付款且关联报价单，业绩归属发货人 --层级3 第一个
@@ -236,6 +239,11 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
                                 return;
 
                             }
+                        }
+                    }
+
+
+
                // }
             }
             TargetLogDO targetLogDO = new TargetLogDO();