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
c7bf42a9
Commit
c7bf42a9
authored
Nov 08, 2024
by
吴一龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix use operatorId
parent
cb90d125
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
api/src/main/java/com/jiejing/fitness/finance/api/axf/request/StudioAxfApplyRequest.java
+1
-1
service/src/main/java/com/jiejing/fitness/finance/service/axf/convert/AxfConvert.java
+2
-2
service/src/main/java/com/jiejing/fitness/finance/service/axf/impl/AxfServiceImpl.java
+1
-1
No files found.
api/src/main/java/com/jiejing/fitness/finance/api/axf/request/StudioAxfApplyRequest.java
View file @
c7bf42a9
...
@@ -94,6 +94,6 @@ public class StudioAxfApplyRequest {
...
@@ -94,6 +94,6 @@ public class StudioAxfApplyRequest {
@ApiModelProperty
(
value
=
"员工ID"
,
required
=
true
)
@ApiModelProperty
(
value
=
"员工ID"
,
required
=
true
)
@NotNull
(
message
=
"员工ID不能为空"
)
@NotNull
(
message
=
"员工ID不能为空"
)
private
Long
bizAccount
Id
;
private
Long
operator
Id
;
}
}
service/src/main/java/com/jiejing/fitness/finance/service/axf/convert/AxfConvert.java
View file @
c7bf42a9
...
@@ -84,8 +84,8 @@ public class AxfConvert {
...
@@ -84,8 +84,8 @@ public class AxfConvert {
apply
.
setState
(
AxfStateEnums
.
INIT
.
getCode
());
apply
.
setState
(
AxfStateEnums
.
INIT
.
getCode
());
apply
.
setChannelNo
(
AxfConst
.
CHANNEL_NO
);
apply
.
setChannelNo
(
AxfConst
.
CHANNEL_NO
);
apply
.
setApplyType
(
AxfConst
.
OPEN
);
apply
.
setApplyType
(
AxfConst
.
OPEN
);
apply
.
setOpId
(
request
.
get
BizAccount
Id
());
apply
.
setOpId
(
request
.
get
Operator
Id
());
apply
.
setOpName
(
adminFunc
.
apply
(
request
.
get
BizAccount
Id
()));
apply
.
setOpName
(
adminFunc
.
apply
(
request
.
get
Operator
Id
()));
apply
.
setStudioName
(
studioFunc
.
apply
(
request
.
getStudioId
()));
apply
.
setStudioName
(
studioFunc
.
apply
(
request
.
getStudioId
()));
apply
.
setSalt
(
salt
);
apply
.
setSalt
(
salt
);
apply
.
setCreateTime
(
new
Date
());
apply
.
setCreateTime
(
new
Date
());
...
...
service/src/main/java/com/jiejing/fitness/finance/service/axf/impl/AxfServiceImpl.java
View file @
c7bf42a9
...
@@ -243,7 +243,7 @@ public class AxfServiceImpl implements AxfService {
...
@@ -243,7 +243,7 @@ public class AxfServiceImpl implements AxfService {
StudioVO
studio
=
studioRpcService
.
getStudio
(
params
.
getStudioId
());
StudioVO
studio
=
studioRpcService
.
getStudio
(
params
.
getStudioId
());
return
null
==
studio
?
""
:
studio
.
getName
();
return
null
==
studio
?
""
:
studio
.
getName
();
},
adminId
->
{
},
adminId
->
{
AdminVO
admin
=
studioRpcService
.
getAdmin
(
params
.
get
BizAccount
Id
());
AdminVO
admin
=
studioRpcService
.
getAdmin
(
params
.
get
Operator
Id
());
return
null
==
admin
?
""
:
admin
.
getName
();
return
null
==
admin
?
""
:
admin
.
getName
();
});
});
...
...
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