Skip to content

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

2024-07-04-8提交

parent c32f6233
Show whitespace changes
Inline Side-by-side
Showing with 82 additions and 16 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/targetLog/TargetLogServiceImpl.java
View file @ 5ba9d7be
...@@ -396,10 +396,23 @@ public class TargetLogServiceImpl extends ...@@ -396,10 +396,23 @@ public class TargetLogServiceImpl extends
consignorDO.getCustomerService()); consignorDO.getCustomerService());
if (d0 != null && d1 != null) { if (d0 != null && d1 != null) {
if (d1.compareTo(d0) > 0) { if (d1.compareTo(d0) > 0) {
s_gsf += ",入参后归属客户经理，不算奖金。"; s_gsf += ",入仓后归属客户经理，不算奖金。"+
String.valueOf(d0)+","+
String.valueOf(d1);
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
TargetLogDO targetLogDO = targetLogMapper.selectById(targetId);
//客户ID
targetLogDO.setCustomerId(customerId);
//客户经理ID
targetLogDO.setUserId(saleManid);
targetLogDO.setLoglev(loglev);
targetLogDO.setGsf(s_gsf);
targetLogDO.setGstype(n_gstype);
targetLogDO.setUpdateTime(new Date());
targetLogMapper.updateById(targetLogDO);
return;
} }
} }
} }
...@@ -412,7 +425,6 @@ public class TargetLogServiceImpl extends ...@@ -412,7 +425,6 @@ public class TargetLogServiceImpl extends
s_gsf += ",客户在公海池,不算奖金。"; s_gsf += ",客户在公海池,不算奖金。";
} }
TargetLogDO targetLogDO = targetLogMapper.selectById(targetId); TargetLogDO targetLogDO = targetLogMapper.selectById(targetId);
//客户ID //客户ID
targetLogDO.setCustomerId(customerId); targetLogDO.setCustomerId(customerId);
...@@ -464,10 +476,23 @@ public class TargetLogServiceImpl extends ...@@ -464,10 +476,23 @@ public class TargetLogServiceImpl extends
consignorDO.getCustomerService()); consignorDO.getCustomerService());
if (d0 != null && d1 != null) { if (d0 != null && d1 != null) {
if (d1.compareTo(d0) > 0) { if (d1.compareTo(d0) > 0) {
s_gsf += ",入参后归属客户经理，不算奖金。"; s_gsf += ",入仓后归属客户经理，不算奖金。"+
String.valueOf(d0)+","+
String.valueOf(d1);
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
TargetLogDO targetLogDO = targetLogMapper.selectById(targetId);
//客户ID
targetLogDO.setCustomerId(customerId);
//客户经理ID
targetLogDO.setUserId(saleManid);
targetLogDO.setLoglev(loglev);
targetLogDO.setGsf(s_gsf);
targetLogDO.setGstype(n_gstype);
targetLogDO.setUpdateTime(new Date());
targetLogMapper.updateById(targetLogDO);
return;
} }
} }
} }
...@@ -563,10 +588,23 @@ public class TargetLogServiceImpl extends ...@@ -563,10 +588,23 @@ public class TargetLogServiceImpl extends
consignorDO.getCustomerService()); consignorDO.getCustomerService());
if (d0 != null && d1 != null) { if (d0 != null && d1 != null) {
if (d1.compareTo(d0) > 0) { if (d1.compareTo(d0) > 0) {
s_gsf += ",入参后归属客户经理，不算奖金。"; s_gsf += ",入仓后归属客户经理，不算奖金。"+
String.valueOf(d0)+","+
String.valueOf(d1);
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
TargetLogDO targetLogDO = targetLogMapper.selectById(targetId);
//客户ID
targetLogDO.setCustomerId(customerId);
//客户经理ID
targetLogDO.setUserId(saleManid);
targetLogDO.setLoglev(loglev);
targetLogDO.setGsf(s_gsf);
targetLogDO.setGstype(n_gstype);
targetLogDO.setUpdateTime(new Date());
targetLogMapper.updateById(targetLogDO);
return;
} }
} }
} }
...@@ -609,7 +647,9 @@ public class TargetLogServiceImpl extends ...@@ -609,7 +647,9 @@ public class TargetLogServiceImpl extends
consigneeDO.getCustomerService()); consigneeDO.getCustomerService());
if (d0 != null && d1 != null) { if (d0 != null && d1 != null) {
if (d1.compareTo(d0) > 0) { if (d1.compareTo(d0) > 0) {
s_gsf += ",入参后归属客户经理，不算奖金。"; s_gsf += ",入仓后归属客户经理，不算奖金。"+
String.valueOf(d0)+","+
String.valueOf(d1);
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
...@@ -662,9 +702,9 @@ public class TargetLogServiceImpl extends ...@@ -662,9 +702,9 @@ public class TargetLogServiceImpl extends
return; return;
} }
if ((consigneeDO.getCustomerService() == null || if (consigneeDO.getCustomerService() == null ||
consigneeDO.getCustomerService() == 0) && consigneeDO.getCustomerService() == 0) {
consigneeDO.getSource() == 12) { //if(consigneeDO.getSource() == 12)
//收货人客户经理为空时不算业绩 //收货人客户经理为空时不算业绩
//客户来源是发货人推荐，不保留业绩记录 customer_source //客户来源是发货人推荐，不保留业绩记录 customer_source
//2024-06-03 添加的逻辑 //2024-06-03 添加的逻辑
...@@ -689,10 +729,23 @@ public class TargetLogServiceImpl extends ...@@ -689,10 +729,23 @@ public class TargetLogServiceImpl extends
consigneeDO.getCustomerService()); consigneeDO.getCustomerService());
if (d0 != null && d1 != null) { if (d0 != null && d1 != null) {
if (d1.compareTo(d0) > 0) { if (d1.compareTo(d0) > 0) {
s_gsf += ",入仓后归属客户经理，不算奖金。"; s_gsf += ",入仓后归属客户经理，不算奖金。"+
String.valueOf(d0)+","+
String.valueOf(d1);
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
TargetLogDO targetLogDO = targetLogMapper.selectById(targetId);
//客户ID
targetLogDO.setCustomerId(customerId);
//客户经理ID
targetLogDO.setUserId(saleManid);
targetLogDO.setLoglev(loglev);
targetLogDO.setGsf(s_gsf);
targetLogDO.setGstype(n_gstype);
targetLogDO.setUpdateTime(new Date());
targetLogMapper.updateById(targetLogDO);
return;
} }
} }
} }
...@@ -746,7 +799,9 @@ public class TargetLogServiceImpl extends ...@@ -746,7 +799,9 @@ public class TargetLogServiceImpl extends
consignorDO.getCustomerService()); consignorDO.getCustomerService());
if (d0 != null && d1 != null) { if (d0 != null && d1 != null) {
if (d1.compareTo(d0) > 0) { if (d1.compareTo(d0) > 0) {
s_gsf += ",入参后归属客户经理，不算奖金。"; s_gsf += ",入参后归属客户经理，不算奖金。"+
String.valueOf(d0)+","+
String.valueOf(d1);
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
...@@ -798,7 +853,9 @@ public class TargetLogServiceImpl extends ...@@ -798,7 +853,9 @@ public class TargetLogServiceImpl extends
consignorDO.getCustomerService()); consignorDO.getCustomerService());
if (d0 != null && d1 != null) { if (d0 != null && d1 != null) {
if (d1.compareTo(d0) > 0) { if (d1.compareTo(d0) > 0) {
s_gsf += ",入参后归属客户经理，不算奖金。"; s_gsf += ",入仓后归属客户经理，不算奖金。"+
String.valueOf(d0)+","+
String.valueOf(d1);;
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
...@@ -839,7 +896,9 @@ public class TargetLogServiceImpl extends ...@@ -839,7 +896,9 @@ public class TargetLogServiceImpl extends
consignorDO.getCustomerService()); consignorDO.getCustomerService());
if (d0 != null && d1 != null) { if (d0 != null && d1 != null) {
if (d1.compareTo(d0) > 0) { if (d1.compareTo(d0) > 0) {
s_gsf += ",入仓后归属客户经理，不算奖金。"; s_gsf += ",入仓后归属客户经理，不算奖金。"+
String.valueOf(d0)+","+
String.valueOf(d1);
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
...@@ -883,14 +942,17 @@ public class TargetLogServiceImpl extends ...@@ -883,14 +942,17 @@ public class TargetLogServiceImpl extends
consignorDO.getCustomerService()); consignorDO.getCustomerService());
if (d0 != null && d1 != null) { if (d0 != null && d1 != null) {
if (d1.compareTo(d0) > 0) { if (d1.compareTo(d0) > 0) {
s_gsf += ",入参后归属客户经理，不算奖金。"; s_gsf += ",入参后归属客户经理，不算奖金。"+
String.valueOf(d0)+","+
String.valueOf(d1);
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
} }
} }
TargetLogDO targetLogDO = targetLogMapper.selectById(targetId); TargetLogDO targetLogDO =
targetLogMapper.selectById(targetId);
//客户ID //客户ID
targetLogDO.setCustomerId(customerId); targetLogDO.setCustomerId(customerId);
//客户经理ID //客户经理ID
...@@ -922,7 +984,9 @@ public class TargetLogServiceImpl extends ...@@ -922,7 +984,9 @@ public class TargetLogServiceImpl extends
consigneeDO.getCustomerService()); consigneeDO.getCustomerService());
if (d0 != null && d1 != null) { if (d0 != null && d1 != null) {
if (d1.compareTo(d0) > 0) { if (d1.compareTo(d0) > 0) {
s_gsf += ",入参后归属客户经理，不算奖金。"; s_gsf += ",入仓后归属客户经理，不算奖金。"+
String.valueOf(d0)+","+
String.valueOf(d1);
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
...@@ -994,7 +1058,9 @@ public class TargetLogServiceImpl extends ...@@ -994,7 +1058,9 @@ public class TargetLogServiceImpl extends
consigneeDO.getCustomerService()); consigneeDO.getCustomerService());
if (d0 != null && d1 != null) { if (d0 != null && d1 != null) {
if (d1.compareTo(d0) > 0) { if (d1.compareTo(d0) > 0) {
s_gsf += ",入参后归属客户经理，不算奖金。"; s_gsf += ",入仓后归属客户经理，不算奖金。"+
String.valueOf(d0)+","+
String.valueOf(d1);
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
......
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