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
f53a57b1
Commit
f53a57b1
authored
Aug 02, 2024
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master-fix' into dev
parents
28edface
233d870a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
OrderSplitServiceImpl.java
...odule/order/service/orderSplit/OrderSplitServiceImpl.java
+6
-1
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderSplit/OrderSplitServiceImpl.java
View file @
f53a57b1
...
...
@@ -52,6 +52,7 @@ import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControl
import
cn.iocoder.yudao.module.order.service.orderLabel.OrderLabelService
;
import
cn.iocoder.yudao.module.order.service.orderWarehouseIn.OrderWarehouseInService
;
import
cn.iocoder.yudao.module.order.service.orderWarehousePicture.OrderWarehousePictureService
;
import
cn.iocoder.yudao.module.order.service.targetLog.TargetLogService
;
import
cn.iocoder.yudao.module.order.vo.approval.OrderApprovalCancelApplyReqVO
;
import
cn.iocoder.yudao.module.order.vo.order.ApplyInfoVO
;
import
cn.iocoder.yudao.module.order.vo.order.CostVO
;
...
...
@@ -86,6 +87,7 @@ import java.util.stream.Collectors;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
exception
.
util
.
ServiceExceptionUtil
.
exception
;
import
static
cn
.
iocoder
.
yudao
.
module
.
order
.
enums
.
ErrorCodeConstants
.*;
import
static
cn
.
iocoder
.
yudao
.
module
.
order
.
enums
.
TargetLogEnum
.
SPLIT
;
/**
* 订单拆单 Service 实现类
...
...
@@ -109,6 +111,8 @@ public class OrderSplitServiceImpl extends AbstractService<OrderSplitMapper, Ord
@Resource
private
OrderApprovalService
orderApprovalService
;
@Resource
private
TargetLogService
targetLogService
;
@Resource
private
OrderService
orderService
;
@Resource
...
...
@@ -1086,7 +1090,8 @@ public class OrderSplitServiceImpl extends AbstractService<OrderSplitMapper, Ord
null
,
0
,
OrderApprovalTypeResultEnum
.
order_split_pass
.
getDesc
(),
false
);
// 原订单的应收单归档删除 (这些应收都是未核销的,核销的是不能拆单的)
// 拆单删除原单可能的业绩日志
targetLogService
.
addTargetLog
(
orderId
,
null
,
SPLIT
);
// 判断是否为子拆单进行的再次拆单,如果是,其订单编号和订单id未变,则不用处理关联和互斥业务
if
(
orderNoAndSeq
.
length
==
1
)
{
receivableService
.
deleteReceivableByOrderId
(
orderId
);
...
...
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