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
92e50bd9
Commit
92e50bd9
authored
Nov 12, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
批量审批业务调整,并兼容批量批量修改后的批量审批提交
parent
02679082
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
OrderFeeApplicationServiceImpl.java
...er/service/order/impl/OrderFeeApplicationServiceImpl.java
+6
-8
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderFeeApplicationServiceImpl.java
View file @
92e50bd9
...
...
@@ -479,12 +479,6 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
batchFeeList
=
this
.
list
(
lambdaQueryWrapper
);
}
for
(
OrderFeeApplicationDO
feeApplicationDO
:
batchFeeList
)
{
feeApplicationDO
.
setStatus
(
result
);
if
(
Objects
.
nonNull
(
feeApplicationDO
.
getId
())){
feeApplicationMapper
.
updateById
(
feeApplicationDO
);
}
else
{
feeApplicationMapper
.
insert
(
feeApplicationDO
);
}
//生成应收
DictDataRespDTO
dictDto
=
DictFrameworkUtils
.
getDictDataFromCache
(
"receivable_fee_type"
,
String
.
valueOf
(
feeApplicationDO
.
getFeeType
()));
if
(
feeApplicationDO
.
getReceivableId
()
!=
null
&&
feeApplicationDO
.
getReceivableId
()
>
0
)
{
...
...
@@ -529,8 +523,12 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
Long
receivableId
=
receivableService
.
createReceivable
(
receivableCreateReqVO
);
feeApplicationDO
.
setReceivableId
(
receivableId
.
intValue
());
}
feeApplicationDO
.
setStatus
(
ApprovalResultStatusEnum
.
pass
.
getValue
());
feeApplicationDO
.
setStatus
(
result
);
if
(
Objects
.
nonNull
(
feeApplicationDO
.
getId
())){
feeApplicationMapper
.
updateById
(
feeApplicationDO
);
}
else
{
feeApplicationMapper
.
insert
(
feeApplicationDO
);
}
FeeDto
feeDto
=
new
FeeDto
();
feeDto
.
setFeeType
(
feeApplicationDO
.
getFeeType
());
feeDto
.
setAmount
(
feeApplicationDO
.
getApplicationFee
());
...
...
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