Skip to content

J
jiedao-api-boot-master
Commit d5bdd968 authored by lanbaoming's avatar lanbaoming
Browse files
Options

2024-07-04-10提交

parent b4c6bab2
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/targetLog/TargetLogServiceImpl.java
View file @ d5bdd968
...@@ -706,12 +706,13 @@ public class TargetLogServiceImpl extends ...@@ -706,12 +706,13 @@ public class TargetLogServiceImpl extends
} }
if (consigneeDO.getCustomerService() == null || if (consigneeDO.getCustomerService() == null ||
consigneeDO.getCustomerService() == 0) { consigneeDO.getCustomerService() == 0||
consigneeDO.getIsInOpenSea() == true) {
//if(consigneeDO.getSource() == 12) //if(consigneeDO.getSource() == 12)
//收货人客户经理为空时不算业绩 //收货人客户经理为空时不算业绩
//客户来源是发货人推荐，不保留业绩记录 customer_source //客户来源是发货人推荐，不保留业绩记录 customer_source
//2024-06-03 添加的逻辑 //2024-06-03 添加的逻辑
s_gsf += ",收货人客户经理为空,发货人推荐，不算奖金。"; s_gsf += ",收货人客户经理为空,货在公海池,发货人推荐，不算奖金。";
saleManid = 0L; saleManid = 0L;
//删除业绩记录 //删除业绩记录
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
...@@ -812,9 +813,7 @@ public class TargetLogServiceImpl extends ...@@ -812,9 +813,7 @@ public class TargetLogServiceImpl extends
} }
} }
if (consignorDO.getCustomerService() == null || if (consignorDO.getIsInOpenSea() == true) {
consignorDO.getCustomerService() == 0 ||
consignorDO.getIsInOpenSea() == true) {
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
...@@ -849,7 +848,7 @@ public class TargetLogServiceImpl extends ...@@ -849,7 +848,7 @@ public class TargetLogServiceImpl extends
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
loglev = 32; loglev = 32;
s_gsf += ",客户经理为空,客户在公海池，不算奖金。"; s_gsf += ",客户经理为空,或客户在公海池，不算奖金。";
} }
Date d1 = orderTimeService.getCustomerOperateDate(customerId, Date d1 = orderTimeService.getCustomerOperateDate(customerId,
...@@ -892,7 +891,7 @@ public class TargetLogServiceImpl extends ...@@ -892,7 +891,7 @@ public class TargetLogServiceImpl extends
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
loglev = 33; loglev = 33;
s_gsf += ",客户经理为空,客户在公海池，不算奖金。"; s_gsf += ",客户经理为空,或客户在公海池，不算奖金。";
} }
Date d1 = orderTimeService.getCustomerOperateDate(customerId, Date d1 = orderTimeService.getCustomerOperateDate(customerId,
......
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