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
553287ad
Commit
553287ad
authored
Jun 12, 2024
by
程裕兵
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:refund
parent
99abe95c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/StudioMerchantRefundVO.java
+5
-0
service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/RefundConvert.java
+2
-0
service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/RefundServiceImpl.java
+1
-0
No files found.
api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/StudioMerchantRefundVO.java
View file @
553287ad
package
com
.
jiejing
.
fitness
.
finance
.
api
.
merchant
.
vo
;
package
com
.
jiejing
.
fitness
.
finance
.
api
.
merchant
.
vo
;
import
com.jiejing.common.swagger.EnumMapping
;
import
com.jiejing.common.swagger.EnumMapping
;
import
com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantCheckRefundVO.CheckRefundCodeEnum
;
import
com.jiejing.paycenter.common.enums.common.TransStateEnums
;
import
com.jiejing.paycenter.common.enums.common.TransStateEnums
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
...
@@ -31,6 +32,10 @@ public class StudioMerchantRefundVO {
...
@@ -31,6 +32,10 @@ public class StudioMerchantRefundVO {
@ApiModelProperty
(
name
=
"三方交易单号"
)
@ApiModelProperty
(
name
=
"三方交易单号"
)
private
String
thirdTransNo
;
private
String
thirdTransNo
;
@EnumMapping
(
enumClass
=
CheckRefundCodeEnum
.
class
)
@ApiModelProperty
(
value
=
"失败code"
)
private
String
failCode
;
@ApiModelProperty
(
name
=
"失败原因"
)
@ApiModelProperty
(
name
=
"失败原因"
)
private
String
failMessage
;
private
String
failMessage
;
...
...
service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/RefundConvert.java
View file @
553287ad
...
@@ -123,6 +123,8 @@ public class RefundConvert {
...
@@ -123,6 +123,8 @@ public class RefundConvert {
return
StudioMerchantRefundVO
.
builder
()
return
StudioMerchantRefundVO
.
builder
()
.
thirdTransNo
(
vo
.
getThirdTransNo
())
.
thirdTransNo
(
vo
.
getThirdTransNo
())
.
transNo
(
refund
.
getTransNo
())
.
transNo
(
refund
.
getTransNo
())
.
failCode
(
TransStateEnums
.
FAIL
.
getCode
().
equals
(
vo
.
getRefundState
())
?
CheckRefundCodeEnum
.
OTHER_ERROR
.
getCode
()
:
CheckRefundCodeEnum
.
SUCCESS
.
getCode
())
.
failMessage
(
vo
.
getFailMessage
())
.
failMessage
(
vo
.
getFailMessage
())
.
refundState
(
vo
.
getRefundState
())
.
refundState
(
vo
.
getRefundState
())
.
successTime
(
vo
.
getSuccessTime
())
.
successTime
(
vo
.
getSuccessTime
())
...
...
service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/RefundServiceImpl.java
View file @
553287ad
...
@@ -120,6 +120,7 @@ public class RefundServiceImpl implements RefundService {
...
@@ -120,6 +120,7 @@ public class RefundServiceImpl implements RefundService {
this
.
refundCallback
(
RefundConvert
.
convertRefundEvent
(
refund
,
checkResult
));
this
.
refundCallback
(
RefundConvert
.
convertRefundEvent
(
refund
,
checkResult
));
return
StudioMerchantRefundVO
.
builder
()
return
StudioMerchantRefundVO
.
builder
()
.
transNo
(
refund
.
getTransNo
())
.
transNo
(
refund
.
getTransNo
())
.
failCode
(
checkResult
.
getCode
())
.
refundState
(
TransStateEnums
.
FAIL
.
getCode
())
.
refundState
(
TransStateEnums
.
FAIL
.
getCode
())
.
failMessage
(
checkResult
.
getFailMessage
())
.
failMessage
(
checkResult
.
getFailMessage
())
.
build
();
.
build
();
...
...
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