Skip to content

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

2024-07-04-5提交

parent b5acb1a9
Show whitespace changes
Inline Side-by-side
Showing with 488 additions and 235 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/targetLog/TargetLogDO.java
View file @ c4f717ee
......@@ -76,4 +76,8 @@ public class TargetLogDO extends BaseDO {
归属方，发货还是收货方
*/
private String gsf;
/*
归属类型
*/
private int gstype;
}
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/targetLog/TargetLogServiceImpl.java
View file @ c4f717ee
......@@ -335,7 +335,7 @@ public class TargetLogServiceImpl extends
public void dealTargetLogTask(Long orderId,
Date achievementTime,
long targetId) {
try {
long selectCount =
targetLogMapper.selectCount(TargetLogDO::getOrderId,
orderId);
......@@ -354,11 +354,14 @@ public class TargetLogServiceImpl extends
return;
}
try {
//客户经理
Long customerId = 0L;
Long saleManid = info.getSalesmanId();
int loglev = 0;
String s_gsf = "n";
int n_gstype = 0;
CustomerDO consignorDO =
customerService.getCustomer(info.getConsignorVO().getCustomerId());
......@@ -374,18 +377,37 @@ public class TargetLogServiceImpl extends
//二期需求修改
customerId = consignorDO.getId();
loglev = 1;
s_gsf = "f";
s_gsf = "归发货客户";
n_gstype = 1;
//客户的客户经理为空，就把业绩归属设为0
if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 ||
consignorDO.getIsInOpenSea() == true) {
consignorDO.getCustomerService() == 0) {
saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 11;
s_gsf += ",客户经理为空,不算奖金。";
}
if (consignorDO.getIsInOpenSea() == true) {
saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 11;
s_gsf += ",客户在公海池,不算奖金。";
}
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;
}
} else {
OrderConsigneeDO orderConsigneeDO =
orderConsigneeService.getOne(
new LambdaQueryWrapper<OrderConsigneeDO>().
......@@ -403,70 +425,150 @@ public class TargetLogServiceImpl extends
if (consignorDO != null && !consignorDO.getNoConsignee()
&& !info.getHasConsignee()) {
//getHasConsignee 是否有收货人
//控货无收货人,1-是，0-否
//发货人档案设置控货无收货人且订单无收获人，归属发货人业绩 -- 层级2
if (consignorDO != null) {
customerId = consignorDO.getId();
loglev = 2;
s_gsf = "f";
n_gstype = 1;
s_gsf = "归发货客户";
//校验客户的客户经理
if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 ||
consignorDO.getIsInOpenSea() == true) {
consignorDO.getCustomerService() == 0) {
saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 21;
s_gsf += ",客户经理为空,不算奖金。";
}
if (consignorDO.getIsInOpenSea() == true) {
saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 21;
s_gsf += ",客户在公海池,不算奖金。";
}
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;
}
} else {
List<TargetOfferBackVO> offerBackVOList =
targetLogMapper.getTargetOfferBackByOrerId(orderId);
if (info.getDrawee() == 1) {
if (CollectionUtil.isNotEmpty(offerBackVOList)) {
//如果是发货人付款且关联报价单，业绩归属发货人 --层级3 第一个
customerId = consignorDO.getId();
loglev = 3;
s_gsf = "f";
n_gstype = 1;
s_gsf = "发货人付运费,有报价单,归发货客户";
//校验客户的客户经理
if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 ||
consignorDO.getIsInOpenSea() == true) {
consignorDO.getCustomerService() == 0) {
saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 31;
s_gsf += ",客户经理为空,不算奖金。";
}
if (consignorDO.getIsInOpenSea() == true) {
saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 31;
s_gsf += ",客户在公海池,不算奖金。";
}
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;
} else {
if (consignorDO.getDefaultPay()) {
//如果是发货人付款且档案设置默认付运费 --层级4 第一个
customerId = consignorDO.getId();
loglev = 4;
s_gsf = "f";
n_gstype = 1;
s_gsf = "发货人付运费,无报价单,默认付运费，归发货客户";
//校验客户的客户经理
if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 ||
consignorDO.getIsInOpenSea() == true) {
consignorDO.getCustomerService() == 0) {
saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 41;
s_gsf += ",客户经理为空,不算奖金。";
}
if (consignorDO.getIsInOpenSea() == true) {
saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 41;
s_gsf += ",客户在公海池,不算奖金。";
}
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;
} else {
//业绩归属方是收货人
loglev = 5;
customerId = orderConsigneeDO.getCustomerId();
s_gsf = "s";
n_gstype = 2;
s_gsf = "发货人付运费,无报价单,不默认付运费，归收货客户";
//校验客户的客户经理
if (consigneeDO.getCustomerService() == null ||
consigneeDO.getCustomerService() == 0 ||
consigneeDO.getIsInOpenSea() == true) {
consigneeDO.getCustomerService() == 0) {
saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 51;
s_gsf += ",客户经理为空,不算奖金。";
}
if (consigneeDO.getIsInOpenSea() == true) {
saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 51;
s_gsf += ",客户在公海池,不算奖金。";
}
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;
}
}
......@@ -475,20 +577,60 @@ public class TargetLogServiceImpl extends
customerId = orderConsigneeDO.getCustomerId() != null ?
orderConsigneeDO.getCustomerId() : consigneeDO.getId();
loglev = 5;
s_gsf = "s";
if (consigneeDO != null &&
(consigneeDO.getCustomerService() == null ||
consigneeDO.getCustomerService() == 0)) {
n_gstype = 2;
s_gsf = "收货人付运费,归收货客户";
if (consigneeDO == null) {
s_gsf += ",收货客户为空。";
customerId = 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;
}
if (consigneeDO.getCustomerService() == null ||
consigneeDO.getCustomerService() == 0) {
//收货人客户经理为空时不算业绩
//客户来源是发货人推荐，不保留业绩记录 customer_source
//2024-06-03 添加的逻辑
if (consigneeDO.getSource() == 12) {
s_gsf += ",收货人客户经理为空，不算奖金。";
customerId = 0L;
//删除业绩记录
targetLogMapper.deleteById(targetId);
orderService.updateOrderSalesmanId(info.getOrderId(),
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;
}
if (consigneeDO.getSource() == 12) {
s_gsf += ",发货人带来的收货人，归收货人客户经理。";
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;
}
} else if (info.getDrawee() == 3) {
......@@ -497,7 +639,7 @@ public class TargetLogServiceImpl extends
JSONObject.parseArray(info.getCustomDrawee(),
CustomDraweeVO.class);
if (CollectionUtil.isNotEmpty(list)) {
s_gsf = "自定义付款,付款人不为空";
List<CustomDraweeVO> freightList =
list.stream().filter(s -> s.getName().equals("freight")).collect(Collectors.toList());
List<CustomDraweeVO> clearanceFeeList =
......@@ -511,24 +653,47 @@ public class TargetLogServiceImpl extends
//层级3 第二个 订单关联报价单 && 自定义付款 且发货人付运费
customerId = orderConsignorDO.getCustomerId();
loglev = 3;
s_gsf = "f";
s_gsf += "有报价单,发货人付运费，归发货客户";
n_gstype = 1;
//校验客户的客户经理
if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0) {
saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 31;
s_gsf += ",客户经理为空,不算奖金。";
}
if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 ||
consignorDO.getIsInOpenSea() == true) {
saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 31;
s_gsf += ",客户在公海池,不算奖金。";
}
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;
} else if (CollectionUtil.isNotEmpty(offerBackVOList)
&& (info.getDrawee() == 3 && clearanceFee == 1)) {
//层级3 第三个 订单关联报价单 && 自定义付款 且发货人付清关费
customerId = orderConsignorDO.getCustomerId();
loglev = 3;
s_gsf = "f";
s_gsf += "有报价单,发货人付清关费，归发货客户";
n_gstype = 1;
//校验客户的客户经理
if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 ||
......@@ -537,14 +702,27 @@ public class TargetLogServiceImpl extends
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 32;
s_gsf += ",客户经理为空,客户在公海池，不算奖金。";
}
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;
} else if (consignorDO.getDefaultPay() &&
(info.getDrawee() == 3 && freight == 1)) {
//层级4 第二个 发货人档案设置默认付运费 且发货人付运费 业绩归属 发货人
customerId = orderConsignorDO.getCustomerId();
loglev = 3;
s_gsf = "f";
n_gstype = 1;
s_gsf += "无报价单,发货人档案设置默认付运费 且发货人付运费，归发货客户";
//校验客户的客户经理
if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 ||
......@@ -553,15 +731,29 @@ public class TargetLogServiceImpl extends
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 33;
s_gsf += ",客户经理为空,客户在公海池，不算奖金。";
}
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;
} else if (consignorDO.getDefaultPay() &&
(info.getDrawee() == 3
&& clearanceFee == 1)) {
// 层级4 第三个 发货人档案设置默认付运费 且发货人付清关费 业绩归属发货人
loglev = 4;
customerId = orderConsignorDO.getCustomerId();
s_gsf = "f";
s_gsf += "无报价单,发货人档案设置默认付运费 且发货人付清关费，归发货客户";
n_gstype = 1;
//校验客户的客户经理
if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 ||
......@@ -570,12 +762,27 @@ public class TargetLogServiceImpl extends
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 1;
s_gsf += ",客户经理为空,客户在公海池，不算奖金。";
}
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;
} else {
customerId = orderConsigneeDO.getCustomerId();
loglev = 5;
s_gsf = "s";
s_gsf += "，不满足自定义付款人前面的条件，归收货人";
n_gstype = 2;
//校验客户的客户经理
if (consigneeDO.getCustomerService() == null ||
consigneeDO.getCustomerService() == 0 ||
......@@ -584,50 +791,93 @@ public class TargetLogServiceImpl extends
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 51;
s_gsf += ",客户经理为空,客户在公海池，不算奖金。";
}
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;
}
}
}
} else {
//业绩归属收货人
if (orderConsigneeDO != null) {
customerId =
orderConsigneeDO.getCustomerId() != null ?
orderConsigneeDO.getCustomerId() : 0;
if (orderConsigneeDO == null) {
s_gsf = "前4级都不满足，归收货人，收货人为空，不算奖金";
customerId = 0L;
n_gstype = 2;
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;
}
customerId = orderConsigneeDO.getCustomerId() != null ?
orderConsigneeDO.getCustomerId() : 0;
loglev = 5;
s_gsf = "s";
s_gsf = "前4级都不满足，归收货人";
n_gstype = 2;
//校验客户的客户经理
if (consigneeDO != null) {
if (consigneeDO.getCustomerService() == null ||
consigneeDO.getCustomerService() == 0 ||
consigneeDO.getIsInOpenSea() == true) {
consigneeDO.getCustomerService() == 0) {
saleManid = 0L;
s_gsf += ",收货人客户经理为空，不算奖金。";
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 52;
}
}
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;
}
}
}
}
if (consigneeDO.getIsInOpenSea() == true) {
saleManid = 0L;
s_gsf += ",收货人客户在公海池，不算奖金。";
saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(),
0L);
loglev = 52;
TargetLogDO targetLogDO = targetLogMapper.selectById(targetId);
//客户ID
targetLogDO.setCustomerId(customerId);
//客户经理ID
targetLogDO.setUserId(saleManid);
if (loglev == 0) {
loglev = -1;
}
targetLogDO.setLoglev(loglev);
targetLogDO.setGsf(s_gsf);
targetLogDO.setGstype(n_gstype);
targetLogDO.setUpdateTime(new Date());
targetLogMapper.updateById(targetLogDO);
return;
}
} catch (Exception e) {
zTest m2 = new zTest();
m2.setTestname(e.getMessage());
m2.setTestname(e.getMessage() + "发生异常，" + info.getOrderNo());
m2.setCreatedate(new Date());
zTestMapper2.insert(m2);
}
......
yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/task/TargetLogJob.java
View file @ c4f717ee
......@@ -57,7 +57,6 @@ public class TargetLogJob implements JobHandler {
//System.out.println("定时任务参数:" + param);
List<TargetLogDO> list = targetLogService.selectList2(sDate);
if (CollectionUtil.isEmpty(list)) {
m.setTestname(sDate+"获取业绩归属数据为空");
m.setCreatedate(new Date());
......
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