Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fit-finance
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fitness-server
fit-finance
Commits
218b0cdb
Commit
218b0cdb
authored
Nov 19, 2024
by
吴一龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
101165d4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
service/src/main/java/com/jiejing/fitness/finance/service/axf/convert/AxfConvert.java
+2
-1
service/src/main/java/com/jiejing/fitness/finance/service/axf/impl/AxfServiceImpl.java
+3
-1
No files found.
service/src/main/java/com/jiejing/fitness/finance/service/axf/convert/AxfConvert.java
View file @
218b0cdb
...
...
@@ -62,6 +62,7 @@ import java.util.Date;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Objects
;
import
java.util.function.Consumer
;
import
java.util.function.Function
;
import
java.util.stream.Collectors
;
...
...
@@ -417,7 +418,7 @@ public class AxfConvert {
public
static
StudioAxfOrderDeductionVO
toDeductionVO
(
StudioAxfOrderDeduction
deduction
)
{
StudioAxfOrderDeductionVO
vo
=
BeanUtil
.
map
(
deduction
,
StudioAxfOrderDeductionVO
.
class
);
vo
.
setActualAmount
(
CommodityOrderDeductionStateEnums
.
SUCCESS
==
vo
.
getState
(
)
?
vo
.
getActualAmount
()
:
null
);
Objects
.
equals
(
CommodityOrderDeductionStateEnums
.
SUCCESS
.
getCode
(),
vo
.
getState
()
)
?
vo
.
getActualAmount
()
:
null
);
return
vo
;
}
...
...
service/src/main/java/com/jiejing/fitness/finance/service/axf/impl/AxfServiceImpl.java
View file @
218b0cdb
...
...
@@ -121,6 +121,7 @@ import java.util.HashMap;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Objects
;
import
java.util.Optional
;
import
java.util.Set
;
import
java.util.concurrent.Executor
;
...
...
@@ -387,7 +388,8 @@ public class AxfServiceImpl implements AxfService {
}
}
List
<
StudioAxfOrderDeductionVO
>
deductions
=
this
.
listDeduction
(
id
);
if
(
deductions
.
stream
().
anyMatch
(
e
->
CommodityOrderDeductionStateEnums
.
FAIL
==
e
.
getState
()))
{
if
(
deductions
.
stream
().
anyMatch
(
e
->
Objects
.
equals
(
CommodityOrderDeductionStateEnums
.
FAIL
.
getCode
(),
e
.
getState
())))
{
throw
new
BizException
(
""
,
"订购单存在扣款失败,请确保扣款成功后再发起解约"
);
}
...
...
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