2024-07-02-5提交

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

@@ -312,7 +312,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
         long selectCount =
                 targetLogMapper.selectCount(TargetLogDO::getOrderId,
                         orderId);
-        if (selectCount ==0L) {
+        if (selectCount == 0L) {
             return;
         }
         //获取订单信息
@@ -358,11 +358,6 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
                                             info.getOrderId()).orderByDesc(
                                             OrderConsignorDO::getId).last("limit 1"));
 
-            if (info.getIsCargoControl()) {
-                //控货订单目前按发货人来算
-                customerId = info.getConsignorVO().getCustomerId();
-
-            } else {
             if (consignorDO != null && !consignorDO.getNoConsignee()
                     && !info.getHasConsignee()) {
                 //getHasConsignee 是否有收货人
@@ -461,10 +456,9 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
 
                 }
             }
+
         }
-        }
-        TargetLogDO targetLogDO =
-                targetLogMapper.selectById(targetId);
+        TargetLogDO targetLogDO = targetLogMapper.selectById(targetId);
         //客户ID
         targetLogDO.setCustomerId(customerId);
         //客户经理ID