Skip to content

J
jiedao-api-boot-master
Commit fd533229 authored by liuzeheng's avatar liuzeheng
Browse files
Options

去掉控货订单不判断归属人

parent 9cbc7658
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ fd533229
...@@ -588,10 +588,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -588,10 +588,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 海外仓归属发货人 // 海外仓归属发货人
order.setCustomerId(orderConsignorDO.getCustomerId()); order.setCustomerId(orderConsignorDO.getCustomerId());
} else { } else {
if (order.getIsCargoControl()) { // if (order.getIsCargoControl()) {
// 控货订单归属发货人 // // 控货订单归属发货人
order.setCustomerId(orderConsignorDO.getCustomerId()); // order.setCustomerId(orderConsignorDO.getCustomerId());
} else { // } else {
// 非控货订单 + 付款人为发货人 归属发货人， 其他归属收货人 // 非控货订单 + 付款人为发货人 归属发货人， 其他归属收货人
// if (order.getDrawee() == 1) { // if (order.getDrawee() == 1) {
// order.setCustomerId(orderConsignorDO.getCustomerId()); // order.setCustomerId(orderConsignorDO.getCustomerId());
...@@ -667,7 +667,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -667,7 +667,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} }
//end //end
}
} }
// 更新所属客户经理(业务员) // 更新所属客户经理(业务员)
...@@ -882,10 +882,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -882,10 +882,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 海外仓归属发货人 // 海外仓归属发货人
order.setCustomerId(orderConsignorDO.getCustomerId()); order.setCustomerId(orderConsignorDO.getCustomerId());
} else { } else {
if (order.getIsCargoControl()) { // if (order.getIsCargoControl()) {
// 控货订单归属发货人 // // 控货订单归属发货人
order.setCustomerId(orderConsignorDO.getCustomerId()); // order.setCustomerId(orderConsignorDO.getCustomerId());
} else { // } else {
// 非控货订单 + 付款人为发货人 归属发货人， 其他归属收货人 // 非控货订单 + 付款人为发货人 归属发货人， 其他归属收货人
// if (order.getDrawee() == 1) { // if (order.getDrawee() == 1) {
// order.setCustomerId(orderConsignorDO.getCustomerId()); // order.setCustomerId(orderConsignorDO.getCustomerId());
...@@ -941,7 +941,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -941,7 +941,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} }
//end //end
} }
} //}
...@@ -971,10 +971,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -971,10 +971,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
order.setCustomerId(orderConsignorDO.getCustomerId()); order.setCustomerId(orderConsignorDO.getCustomerId());
order.setSalesmanId(consignorDO.getCustomerService()!=null?consignorDO.getCustomerService():0) ; order.setSalesmanId(consignorDO.getCustomerService()!=null?consignorDO.getCustomerService():0) ;
} else{ } else{
if(order.getIsCargoControl()){ // if(order.getIsCargoControl()){
order.setCustomerId(orderConsignorDO.getCustomerId()); // order.setCustomerId(orderConsignorDO.getCustomerId());
order.setSalesmanId(consignorDO.getCustomerService()!=null?consignorDO.getCustomerService():0) ; // order.setSalesmanId(consignorDO.getCustomerService()!=null?consignorDO.getCustomerService():0) ;
}else{ // }else{
if(consignorDO !=null && ! consignorDO.getNoConsignee() && !order.getHasConsignee()){//发货人档案设置控货无收货人且订单无收获人，归属发货人业绩 -- 层级2 if(consignorDO !=null && ! consignorDO.getNoConsignee() && !order.getHasConsignee()){//发货人档案设置控货无收货人且订单无收获人，归属发货人业绩 -- 层级2
if(consignorDO!=null){ if(consignorDO!=null){
order.setCustomerId(orderConsignorDO.getCustomerId()); order.setCustomerId(orderConsignorDO.getCustomerId());
...@@ -1047,7 +1047,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1047,7 +1047,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} }
} }
} //}
} }
...@@ -1065,9 +1065,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1065,9 +1065,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
order.setCustomerId(orderConsignorDO.getCustomerId()); order.setCustomerId(orderConsignorDO.getCustomerId());
order.setSalesmanId(consignorDO.getCustomerService()!=null?consignorDO.getCustomerService():0) ; order.setSalesmanId(consignorDO.getCustomerService()!=null?consignorDO.getCustomerService():0) ;
} else{ } else{
if(order.getIsCargoControl()){ // if(order.getIsCargoControl()){
order.setCustomerId(orderConsignorDO.getCustomerId()); // order.setCustomerId(orderConsignorDO.getCustomerId());
}else{ // }else{
if(consignorDO !=null && ! consignorDO.getNoConsignee() && !order.getHasConsignee()){//发货人档案设置控货无收货人且订单无收获人，归属发货人业绩 -- 层级2 if(consignorDO !=null && ! consignorDO.getNoConsignee() && !order.getHasConsignee()){//发货人档案设置控货无收货人且订单无收获人，归属发货人业绩 -- 层级2
if(consignorDO!=null){ if(consignorDO!=null){
order.setCustomerId(orderConsignorDO.getCustomerId()); order.setCustomerId(orderConsignorDO.getCustomerId());
...@@ -1172,7 +1172,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1172,7 +1172,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} }
} }
} //}
} }
} }
...@@ -3296,10 +3296,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3296,10 +3296,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 海外仓归属发货人 // 海外仓归属发货人
updateObj.setCustomerId(orderConsignorDO.getCustomerId()); updateObj.setCustomerId(orderConsignorDO.getCustomerId());
} else { } else {
if (updateObj.getIsCargoControl()) { // if (updateObj.getIsCargoControl()) {
// 控货订单归属发货人 // // 控货订单归属发货人
updateObj.setCustomerId(orderConsignorDO.getCustomerId()); // updateObj.setCustomerId(orderConsignorDO.getCustomerId());
} else { // } else {
// 非控货订单 + 付款人为发货人 归属发货人， 其他归属收货人 // 非控货订单 + 付款人为发货人 归属发货人， 其他归属收货人
// if (updateObj.getDrawee() == 1) { // if (updateObj.getDrawee() == 1) {
// updateObj.setCustomerId(orderConsignorDO.getCustomerId()); // updateObj.setCustomerId(orderConsignorDO.getCustomerId());
...@@ -3359,7 +3359,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3359,7 +3359,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} }
} }
}
...@@ -3594,10 +3594,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3594,10 +3594,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 海外仓归属发货人 // 海外仓归属发货人
updateObj.setCustomerId(orderConsignorDO.getCustomerId()); updateObj.setCustomerId(orderConsignorDO.getCustomerId());
} else { } else {
if (updateObj.getIsCargoControl()) { // if (updateObj.getIsCargoControl()) {
// 控货订单归属发货人 // // 控货订单归属发货人
updateObj.setCustomerId(orderConsignorDO.getCustomerId()); // updateObj.setCustomerId(orderConsignorDO.getCustomerId());
} else { // } else {
if(!consignorDO.getNoConsignee() && !updateObj.getHasConsignee()){//发货人档案设置控货无收货人且订单无收获人，归属发货人业绩 -- 层级2 if(!consignorDO.getNoConsignee() && !updateObj.getHasConsignee()){//发货人档案设置控货无收货人且订单无收获人，归属发货人业绩 -- 层级2
updateObj.setCustomerId(orderConsignorDO.getCustomerId()) ; updateObj.setCustomerId(orderConsignorDO.getCustomerId()) ;
}else{ }else{
...@@ -3653,7 +3653,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3653,7 +3653,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// customerType = 2; // customerType = 2;
// updateObj.setCustomerId(orderConsigneeDO.getCustomerId()); // updateObj.setCustomerId(orderConsigneeDO.getCustomerId());
// } // }
} // }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment