Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
4ac76a59
Commit
4ac76a59
authored
Mar 27, 2025
by
Smile
Committed by
wux
Mar 28, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug338 报价单-结果-关联订单没有更新业绩,当入仓订单编辑时关联报价单,关联上之后,重新修改付款人时候,这时候走审批流程,但是会进入报价单关联的重新修改业绩,导致没审批业绩就变了
parent
10ce58d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+0
-2
OfferAssociationOrderListener.java
...o/module/sale/listener/OfferAssociationOrderListener.java
+7
-0
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @
4ac76a59
...
...
@@ -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
);
...
...
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/listener/OfferAssociationOrderListener.java
View file @
4ac76a59
...
...
@@ -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
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment