Skip to content

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

2024-07-04-1提交

parent 42c7d102
Show whitespace changes
Inline Side-by-side
Showing with 241 additions and 247 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/targetLog/TargetLogServiceImpl.java
View file @ b0532416
...@@ -11,8 +11,10 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; ...@@ -11,8 +11,10 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.customer.dal.dataobject.customer.CustomerDO; import cn.iocoder.yudao.module.customer.dal.dataobject.customer.CustomerDO;
import cn.iocoder.yudao.module.customer.service.customer.CustomerService; import cn.iocoder.yudao.module.customer.service.customer.CustomerService;
import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO; import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
import cn.iocoder.yudao.module.order.dal.dataobject.order.zTest;
import cn.iocoder.yudao.module.order.dal.dataobject.orderConsignee.OrderConsigneeDO; import cn.iocoder.yudao.module.order.dal.dataobject.orderConsignee.OrderConsigneeDO;
import cn.iocoder.yudao.module.order.dal.dataobject.orderConsignor.OrderConsignorDO; import cn.iocoder.yudao.module.order.dal.dataobject.orderConsignor.OrderConsignorDO;
import cn.iocoder.yudao.module.order.dal.mysql.order.ZTestMapper2;
import cn.iocoder.yudao.module.order.dto.OrderBackInfoDto; import cn.iocoder.yudao.module.order.dto.OrderBackInfoDto;
import cn.iocoder.yudao.module.order.service.order.OrderConsigneeService; import cn.iocoder.yudao.module.order.service.order.OrderConsigneeService;
import cn.iocoder.yudao.module.order.service.order.OrderConsignorService; import cn.iocoder.yudao.module.order.service.order.OrderConsignorService;
...@@ -61,6 +63,8 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -61,6 +63,8 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
@Resource @Resource
private OrderConsignorService orderConsignorService; private OrderConsignorService orderConsignorService;
@Resource
ZTestMapper2 zTestMapper2;
public List<TargetLogDO> selectList2(String sDate) { public List<TargetLogDO> selectList2(String sDate) {
return targetLogMapper.selectList2(sDate); return targetLogMapper.selectList2(sDate);
...@@ -208,7 +212,6 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -208,7 +212,6 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
orderConsignorService.getOne( orderConsignorService.getOne(
new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, info.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1")); new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, info.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1"));
if (consignorDO != null && !consignorDO.getNoConsignee() if (consignorDO != null && !consignorDO.getNoConsignee()
&& !info.getHasConsignee()) { && !info.getHasConsignee()) {
//getHasConsignee 是否有收货人 //getHasConsignee 是否有收货人
...@@ -331,6 +334,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -331,6 +334,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
public void dealTargetLogTask(Long orderId, public void dealTargetLogTask(Long orderId,
Date achievementTime, Date achievementTime,
long targetId) { long targetId) {
try {
long selectCount = long selectCount =
targetLogMapper.selectCount(TargetLogDO::getOrderId, targetLogMapper.selectCount(TargetLogDO::getOrderId,
orderId); orderId);
...@@ -352,7 +356,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -352,7 +356,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
//客户经理 //客户经理
Long customerId = 0L; Long customerId = 0L;
Long saleManid = info.getSalesmanId(); Long saleManid = info.getSalesmanId();
int loglev=0; int loglev = 0;
CustomerDO consignorDO = CustomerDO consignorDO =
customerService.getCustomer(info.getConsignorVO().getCustomerId()); customerService.getCustomer(info.getConsignorVO().getCustomerId());
...@@ -367,6 +371,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -367,6 +371,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
//customerId = info.getConsignorVO().getCustomerId(); //customerId = info.getConsignorVO().getCustomerId();
//二期需求修改 //二期需求修改
customerId = consignorDO.getId(); customerId = consignorDO.getId();
loglev = 1;
//客户的客户经理为空，就把业绩归属设为0 //客户的客户经理为空，就把业绩归属设为0
if (consignorDO.getCustomerService() == null || if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 || consignorDO.getCustomerService() == 0 ||
...@@ -374,9 +379,8 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -374,9 +379,8 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
loglev=11; loglev = 11;
} }
loglev=1;
} else { } else {
OrderConsigneeDO orderConsigneeDO = OrderConsigneeDO orderConsigneeDO =
...@@ -399,7 +403,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -399,7 +403,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
//发货人档案设置控货无收货人且订单无收获人，归属发货人业绩 -- 层级2 //发货人档案设置控货无收货人且订单无收获人，归属发货人业绩 -- 层级2
if (consignorDO != null) { if (consignorDO != null) {
customerId = consignorDO.getId(); customerId = consignorDO.getId();
loglev=2; loglev = 2;
//校验客户的客户经理 //校验客户的客户经理
if (consignorDO.getCustomerService() == null || if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 || consignorDO.getCustomerService() == 0 ||
...@@ -408,7 +412,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -408,7 +412,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
loglev=21; loglev = 21;
} }
} }
...@@ -416,24 +420,10 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -416,24 +420,10 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
List<TargetOfferBackVO> offerBackVOList = List<TargetOfferBackVO> offerBackVOList =
targetLogMapper.getTargetOfferBackByOrerId(orderId); targetLogMapper.getTargetOfferBackByOrerId(orderId);
if (info.getDrawee() == 1) { if (info.getDrawee() == 1) {
//发货人付款
/*
if (info.getDrawee() == 1 &&
CollectionUtil.isNotEmpty(offerBackVOList)) {
//如果是发货人付款且关联报价单，业绩归属发货人 --层级3 第一个
customerId = consignorDO.getId();
}else if(info.getDrawee() == 1 &&
consignorDO.getDefaultPay() ){
// 如果是发货人付款且档案设置默认付运费 --层级4 第一个
customerId = consignorDO.getId();
}else{
//业绩归属方是收货人
customerId = orderConsigneeDO.getCustomerId() ;
}*/
if (CollectionUtil.isNotEmpty(offerBackVOList)) { if (CollectionUtil.isNotEmpty(offerBackVOList)) {
//如果是发货人付款且关联报价单，业绩归属发货人 --层级3 第一个 //如果是发货人付款且关联报价单，业绩归属发货人 --层级3 第一个
customerId = consignorDO.getId(); customerId = consignorDO.getId();
loglev=3; loglev = 3;
//校验客户的客户经理 //校验客户的客户经理
if (consignorDO.getCustomerService() == null || if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 || consignorDO.getCustomerService() == 0 ||
...@@ -441,13 +431,13 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -441,13 +431,13 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
loglev=31; loglev = 31;
} }
} else { } else {
if (consignorDO.getDefaultPay()) { if (consignorDO.getDefaultPay()) {
//如果是发货人付款且档案设置默认付运费 --层级4 第一个 //如果是发货人付款且档案设置默认付运费 --层级4 第一个
customerId = consignorDO.getId(); customerId = consignorDO.getId();
loglev=4; loglev = 4;
//校验客户的客户经理 //校验客户的客户经理
if (consignorDO.getCustomerService() == null || if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 || consignorDO.getCustomerService() == 0 ||
...@@ -455,11 +445,11 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -455,11 +445,11 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
loglev=41; loglev = 41;
} }
} else { } else {
//业绩归属方是收货人 //业绩归属方是收货人
loglev=5; loglev = 5;
customerId = orderConsigneeDO.getCustomerId(); customerId = orderConsigneeDO.getCustomerId();
//校验客户的客户经理 //校验客户的客户经理
if (consigneeDO.getCustomerService() == null || if (consigneeDO.getCustomerService() == null ||
...@@ -468,7 +458,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -468,7 +458,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
loglev=51; loglev = 51;
} }
} }
} }
...@@ -477,7 +467,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -477,7 +467,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
//收货人付款 层级5 第一个 //收货人付款 层级5 第一个
customerId = orderConsigneeDO.getCustomerId() != null ? customerId = orderConsigneeDO.getCustomerId() != null ?
orderConsigneeDO.getCustomerId() : consigneeDO.getId(); orderConsigneeDO.getCustomerId() : consigneeDO.getId();
loglev=5; loglev = 5;
if (consigneeDO != null && if (consigneeDO != null &&
(consigneeDO.getCustomerService() == null || (consigneeDO.getCustomerService() == null ||
consigneeDO.getCustomerService() == 0)) { consigneeDO.getCustomerService() == 0)) {
...@@ -512,7 +502,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -512,7 +502,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
(info.getDrawee() == 3 && freight == 1)) { (info.getDrawee() == 3 && freight == 1)) {
//层级3 第二个 订单关联报价单 && 自定义付款 且发货人付运费 //层级3 第二个 订单关联报价单 && 自定义付款 且发货人付运费
customerId = orderConsignorDO.getCustomerId(); customerId = orderConsignorDO.getCustomerId();
loglev=3; loglev = 3;
//校验客户的客户经理 //校验客户的客户经理
if (consignorDO.getCustomerService() == null || if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 || consignorDO.getCustomerService() == 0 ||
...@@ -520,14 +510,14 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -520,14 +510,14 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
loglev=31; loglev = 31;
} }
} else if (CollectionUtil.isNotEmpty(offerBackVOList) } else if (CollectionUtil.isNotEmpty(offerBackVOList)
&& (info.getDrawee() == 3 && clearanceFee == 1)) { && (info.getDrawee() == 3 && clearanceFee == 1)) {
//层级3 第三个 订单关联报价单 && 自定义付款 且发货人付清关费 //层级3 第三个 订单关联报价单 && 自定义付款 且发货人付清关费
customerId = orderConsignorDO.getCustomerId(); customerId = orderConsignorDO.getCustomerId();
loglev=3; loglev = 3;
//校验客户的客户经理 //校验客户的客户经理
if (consignorDO.getCustomerService() == null || if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 || consignorDO.getCustomerService() == 0 ||
...@@ -535,14 +525,14 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -535,14 +525,14 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
loglev=32; loglev = 32;
} }
} else if (consignorDO.getDefaultPay() && } else if (consignorDO.getDefaultPay() &&
(info.getDrawee() == 3 && freight == 1)) { (info.getDrawee() == 3 && freight == 1)) {
//层级4 第二个 发货人档案设置默认付运费 且发货人付运费 业绩归属 发货人 //层级4 第二个 发货人档案设置默认付运费 且发货人付运费 业绩归属 发货人
customerId = orderConsignorDO.getCustomerId(); customerId = orderConsignorDO.getCustomerId();
loglev=3; loglev = 3;
//校验客户的客户经理 //校验客户的客户经理
if (consignorDO.getCustomerService() == null || if (consignorDO.getCustomerService() == null ||
consignorDO.getCustomerService() == 0 || consignorDO.getCustomerService() == 0 ||
...@@ -550,14 +540,14 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -550,14 +540,14 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
loglev=33; loglev = 33;
} }
} else if (consignorDO.getDefaultPay() && } else if (consignorDO.getDefaultPay() &&
(info.getDrawee() == 3 (info.getDrawee() == 3
&& clearanceFee == 1)) { && clearanceFee == 1)) {
// 层级4 第三个 发货人档案设置默认付运费 且发货人付清关费 业绩归属发货人 // 层级4 第三个 发货人档案设置默认付运费 且发货人付清关费 业绩归属发货人
loglev=4; loglev = 4;
customerId = orderConsignorDO.getCustomerId(); customerId = orderConsignorDO.getCustomerId();
//校验客户的客户经理 //校验客户的客户经理
if (consignorDO.getCustomerService() == null || if (consignorDO.getCustomerService() == null ||
...@@ -566,12 +556,12 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -566,12 +556,12 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
loglev=1; loglev = 1;
} }
} else { } else {
customerId = orderConsigneeDO.getCustomerId(); customerId = orderConsigneeDO.getCustomerId();
loglev=5; loglev = 5;
//校验客户的客户经理 //校验客户的客户经理
if (consigneeDO.getCustomerService() == null || if (consigneeDO.getCustomerService() == null ||
consigneeDO.getCustomerService() == 0 || consigneeDO.getCustomerService() == 0 ||
...@@ -579,14 +569,9 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -579,14 +569,9 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
loglev=51; loglev = 51;
} }
} }
// if(!consignorDO.getDefaultPay() && (info.getDrawee()==3 && freight==2 ) || (info.getDrawee()==3 && clearanceFee==2)){//层级5 第二、第三点 自定义付款且收款人付运费 或自定义付款且收款人付清关费 ，业绩归属收货人
// customerId = orderConsigneeDO.getCustomerId() ;
//
// }
} }
} else { } else {
...@@ -596,7 +581,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -596,7 +581,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
orderConsigneeDO.getCustomerId() != null ? orderConsigneeDO.getCustomerId() != null ?
orderConsigneeDO.getCustomerId() : 0; orderConsigneeDO.getCustomerId() : 0;
loglev=5; loglev = 5;
//校验客户的客户经理 //校验客户的客户经理
if (consigneeDO != null) { if (consigneeDO != null) {
if (consigneeDO.getCustomerService() == null || if (consigneeDO.getCustomerService() == null ||
...@@ -605,7 +590,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -605,7 +590,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
saleManid = 0L; saleManid = 0L;
orderService.updateOrderSalesmanId(info.getOrderId(), orderService.updateOrderSalesmanId(info.getOrderId(),
0L); 0L);
loglev=52; loglev = 52;
} }
} }
} }
...@@ -618,8 +603,17 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe ...@@ -618,8 +603,17 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
targetLogDO.setCustomerId(customerId); targetLogDO.setCustomerId(customerId);
//客户经理ID //客户经理ID
targetLogDO.setUserId(saleManid); targetLogDO.setUserId(saleManid);
targetLogDO.setLoglev(100);
targetLogDO.setUpdateTime(new Date()); targetLogDO.setUpdateTime(new Date());
targetLogMapper.updateById(targetLogDO); targetLogMapper.updateById(targetLogDO);
} }
catch (Exception e)
{
zTest m2 = new zTest();
m2.setTestname(e.getMessage());
m2.setCreatedate(new Date());
zTestMapper2.insert(m2);
}
}
} }
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