补充注释

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -669,7 +669,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             }
         }
     }
-
+    //新增订单 客户联系人处理
     private void adminSaveConsignorAndConsignee(OrderCreateReqVO createReqVO, OrderDO order, String creator,
                                                 Date now, DictDataRespDTO dictDataRespDTO) {
         OrderConsignorDO orderConsignorDO = new OrderConsignorDO();
@@ -890,7 +890,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                 // 补充业绩规则判断
                 if(!consignorDO.getNoConsignee()  && !order.getHasConsignee()){//发货人档案设置控货无收货人且订单无收获人，归属发货人业绩 -- 层级2
                     order.setCustomerId(orderConsignorDO.getCustomerId()) ;
-                }
+                }else{
                     if (order.getDrawee() == 1) {//发货人付款
                         if (order.getDrawee() == 1 && createReqVO.getOfferId() != null) {//如果是发货人付款且关联报价单，业绩归属发货人 --层级3 第一个
                             order.setCustomerId(orderConsignorDO.getCustomerId()) ;
@@ -930,6 +930,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                         order.setSalesmanId(0L);
                     }
                     //end
+                }
+
 
 
 
@@ -1030,14 +1032,14 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         }
 
     }
-
+    //新增判断客户归属
     private void addOrderSalesmanCustomerService(OrderCreateReqVO createReqVO,OrderDO order) {
 
         OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, order.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1"));
         OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, order.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1"));
         CustomerDO consignorDO = customerService.getCustomer(orderConsignorDO.getCustomerId());
         CustomerDO consigneeDO = customerService.getCustomer(orderConsigneeDO.getCustomerId());//收货人
-        if (Objects.nonNull(order.getType()) && order.getType().contains("2")) {
+        if (Objects.nonNull(order.getType()) && order.getType().contains("2")) {//层级1
             // 海外仓归属发货人
             order.setCustomerId(orderConsignorDO.getCustomerId());
             order.setSalesmanId(consignorDO.getCustomerService()!=null?consignorDO.getCustomerService():0) ;
@@ -1048,7 +1050,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     order.setSalesmanId(consignorDO.getCustomerService()!=null?consignorDO.getCustomerService():0);
                 }
 
-            }
+            }else{
 //            else{
 //                List<CustomDraweeVO> list = JSONObject.parseArray(order.getCustomDrawee(), CustomDraweeVO.class);
 //                if(CollectionUtil.isNotEmpty(list)){
@@ -1056,11 +1058,11 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
 //                    List<CustomDraweeVO>  clearanceFeeList = list.stream().filter(s-> s.getName().equals("clearanceFee")  ).collect(Collectors.toList());
 //                    int freight  = freightList.get(0).getValue() ;//运费
 //                    int clearanceFee = clearanceFeeList.get(0).getValue();//清关费
-//                    if((createReqVO.getOfferId()!=null && order.getDrawee() == 1) || (createReqVO.getOfferId()!=null && freight==1)  || (createReqVO.getOfferId()!=null && clearanceFee==1)){
+//                    if((createReqVO.getOfferId()!=null && order.getDrawee() == 1) || (createReqVO.getOfferId()!=null && freight==1)  || (createReqVO.getOfferId()!=null && clearanceFee==1)){//层级3
 //                            order.setCustomerId(orderConsignorDO.getCustomerId());
 //                    order.setSalesmanId(consignorDO.getCustomerService()!=null?consignorDO.getCustomerService():0);
 //                    }else{
-//                        if( (consignorDO.getDefaultPay()  && order.getDrawee() == 2 ) ||  (consignorDO.getDefaultPay() && freight==1 ) ||  (consignorDO.getDefaultPay() && clearanceFee==1 )){
+//                        if( (consignorDO.getDefaultPay()  && order.getDrawee() == 2 ) ||  (consignorDO.getDefaultPay() && freight==1 ) ||  (consignorDO.getDefaultPay() && clearanceFee==1 )){//层级4
 //                            order.setCustomerId(orderConsignorDO.getCustomerId());
 //                            order.setSalesmanId(consignorDO.getCustomerService()!=null?consignorDO.getCustomerService():0);
 //                        }else{
@@ -1078,7 +1080,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
 
 
 
-            List<TargetOfferBackVO>  offerBackVOList =targetLogMapper.getTargetOfferBackByOrerId(order.getOrderId()) ;
+
             if (order.getDrawee() == 1) {//发货人付款
                 if (order.getDrawee() == 1 && createReqVO.getOfferId()!=null) {//如果是发货人付款且关联报价单，业绩归属发货人 --层级3 第一个
 
@@ -1143,7 +1145,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
 
             }
           }
-
+        }
     }
 
     private void addOrderCustomerServiceAndCustomer(OrderCreateReqVO createReqVO,OrderDO order, int customerType) {