Commit 4ac76a59 authored by Smile's avatar Smile Committed by wux

bug338 报价单-结果-关联订单没有更新业绩,当入仓订单编辑时关联报价单,关联上之后,重新修改付款人时候,这时候走审批流程,但是会进入报价单关联的重新修改业绩,导致没审批业绩就变了

parent 10ce58d0
......@@ -1861,8 +1861,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
String updater = String.valueOf(loginUser != null ? loginUser.getId() : null);
if (Objects.nonNull(updateReqVO.getOfferId()) && updateReqVO.getOfferId() > 0L) {
applicationContext.publishEvent(new OfferAssociationOrderEvent(updateReqVO.getOfferId(), updateObj.getOrderId(), updateObj.getOrderNo(), updater));
//重新计算业绩
offerUpdateOrderSalesman(updateObj, updateReqVO.getOfferId());
}
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(vo.getOrderId(), null, ORDER_UPDATE.getValue(), null, false);
applicationContext.publishEvent(approvalTypeCheckEvent);
......
......@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.sale.listener;
import cn.iocoder.yudao.framework.apollo.core.event.OfferAssociationOrderEvent;
import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
import cn.iocoder.yudao.module.order.service.order.OrderService;
import cn.iocoder.yudao.module.sale.dal.dataobject.offer.OfferDO;
import cn.iocoder.yudao.module.sale.service.offer.OfferService;
import lombok.AllArgsConstructor;
......@@ -24,6 +26,7 @@ import static cn.iocoder.yudao.module.sale.enums.ErrorCodeConstants.*;
public class OfferAssociationOrderListener {
private final OfferService offerService;
private final OrderService orderService;
/**
* 有最新编号记录则执行修改或插入操作,无最新编号记录执行查询最新编号记录操作
......@@ -43,6 +46,10 @@ public class OfferAssociationOrderListener {
if (!Objects.equals(offerDO.getOrderId(), event.getOrderId())) {
throw exception(ORDER_ASSOCIATION_OFFER_NO_CAN_UPDATE);
}
}else {
//当订单第一次绑定报价单时,重新计算业绩
OrderDO updateObj = orderService.selectOne(OrderDO::getOrderId,event.getOrderId());
orderService.offerUpdateOrderSalesman(updateObj, offerDO.getOfferId());
}
offerDO.setOrderNo(event.getOrderNo());
offerDO.setOrderId(event.getOrderId());
......
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