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
2e2a73ee
Commit
2e2a73ee
authored
May 30, 2024
by
liuzeheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化
parent
be3de7cc
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
312 additions
and
295 deletions
+312
-295
OrderService.java
...ocoder/yudao/module/order/service/order/OrderService.java
+5
-2
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+306
-292
OfferServiceImpl.java
...udao/module/sale/service/offer/impl/OfferServiceImpl.java
+1
-1
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/OrderService.java
View file @
2e2a73ee
package
cn
.
iocoder
.
yudao
.
module
.
order
.
service
.
order
;
import
cn.iocoder.yudao.framework.mybatis.core.service.IService
;
import
cn.iocoder.yudao.module.customer.dal.dataobject.customer.CustomerDO
;
import
cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO
;
import
cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO
;
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.dto.OrderBackInfoDto
;
import
cn.iocoder.yudao.module.order.vo.approval.OrderSpecialApplyVO
;
import
cn.iocoder.yudao.module.order.vo.approval.OrderSpecialBatchApplyVO
;
...
...
@@ -261,10 +264,10 @@ public interface OrderService extends IService<OrderDO> {
/**
*设置订单业绩归属
* @param order
DO
* @param order
* @param offerId
*/
void
checkOrderSalesman
(
OrderDO
order
DO
,
Long
offerId
)
;
void
checkOrderSalesman
(
OrderDO
order
,
Long
offerId
,
CustomerDO
consignorDO
,
CustomerDO
consigneeDO
,
OrderConsignorDO
orderConsignorDO
,
OrderConsigneeDO
orderConsigneeDO
)
;
/**
* 更新订单提单号
*
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @
2e2a73ee
This diff is collapsed.
Click to expand it.
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/service/offer/impl/OfferServiceImpl.java
View file @
2e2a73ee
...
...
@@ -927,7 +927,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
* @param offerId
*/
private
void
checkOrderSalesman
(
OrderDO
orderDO
,
Long
offerId
)
{
orderService
.
checkOrderSalesman
(
orderDO
,
offerId
);
orderService
.
checkOrderSalesman
(
orderDO
,
offerId
,
null
,
null
,
null
,
null
);
orderService
.
updateOrderCustomerAndSalesmanId
(
orderDO
.
getCustomerId
()!=
null
?
orderDO
.
getCustomerId
():
0
,
orderDO
.
getSalesmanId
()!=
null
?
orderDO
.
getSalesmanId
():
0
,
orderDO
.
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