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
dcb71385
Commit
dcb71385
authored
Jun 13, 2024
by
程裕兵
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:refund
parent
c8bb1dbc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
2 deletions
+46
-2
service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/RefundConvert.java
+7
-2
service/src/main/java/com/jiejing/fitness/finance/service/pay/enums/RefundFailMessageReplaceEnums.java
+39
-0
No files found.
service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/RefundConvert.java
View file @
dcb71385
...
@@ -12,6 +12,7 @@ import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantRefundVO;
...
@@ -12,6 +12,7 @@ import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantRefundVO;
import
com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantCheckRefundVO.CheckRefundCodeEnum
;
import
com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantCheckRefundVO.CheckRefundCodeEnum
;
import
com.jiejing.fitness.finance.repository.entity.StudioCashierRecord
;
import
com.jiejing.fitness.finance.repository.entity.StudioCashierRecord
;
import
com.jiejing.fitness.finance.service.enums.FinanceErrorEnums
;
import
com.jiejing.fitness.finance.service.enums.FinanceErrorEnums
;
import
com.jiejing.fitness.finance.service.pay.enums.RefundFailMessageReplaceEnums
;
import
com.jiejing.fitness.finance.service.pay.params.StudioMerchantRefundParams
;
import
com.jiejing.fitness.finance.service.pay.params.StudioMerchantRefundParams
;
import
com.jiejing.fitness.finance.service.utils.FeeUtil
;
import
com.jiejing.fitness.finance.service.utils.FeeUtil
;
import
com.jiejing.fitness.finance.service.utils.MoneyUtil
;
import
com.jiejing.fitness.finance.service.utils.MoneyUtil
;
...
@@ -92,7 +93,7 @@ public class RefundConvert {
...
@@ -92,7 +93,7 @@ public class RefundConvert {
return
StudioCashierRecord
.
builder
()
return
StudioCashierRecord
.
builder
()
.
id
(
record
.
getId
())
.
id
(
record
.
getId
())
.
transState
(
PayConvert
.
convertTransState
(
TransStateEnums
.
getByCode
(
event
.
getRefundState
())).
getCode
())
.
transState
(
PayConvert
.
convertTransState
(
TransStateEnums
.
getByCode
(
event
.
getRefundState
())).
getCode
())
.
failMessage
(
event
.
getFailMessage
(
))
.
failMessage
(
RefundConvert
.
replaceFailMessage
(
event
.
getFailMessage
()
))
.
successTime
(
event
.
getSuccessTime
())
.
successTime
(
event
.
getSuccessTime
())
.
updateTime
(
new
Date
())
.
updateTime
(
new
Date
())
.
build
();
.
build
();
...
@@ -129,12 +130,16 @@ public class RefundConvert {
...
@@ -129,12 +130,16 @@ public class RefundConvert {
.
transNo
(
refund
.
getTransNo
())
.
transNo
(
refund
.
getTransNo
())
.
failCode
(
TransStateEnums
.
FAIL
.
getCode
().
equals
(
vo
.
getRefundState
())
.
failCode
(
TransStateEnums
.
FAIL
.
getCode
().
equals
(
vo
.
getRefundState
())
?
CheckRefundCodeEnum
.
OTHER_ERROR
.
getCode
()
:
CheckRefundCodeEnum
.
SUCCESS
.
getCode
())
?
CheckRefundCodeEnum
.
OTHER_ERROR
.
getCode
()
:
CheckRefundCodeEnum
.
SUCCESS
.
getCode
())
.
failMessage
(
vo
.
getFailMessage
(
))
.
failMessage
(
replaceFailMessage
(
vo
.
getFailMessage
()
))
.
refundState
(
vo
.
getRefundState
())
.
refundState
(
vo
.
getRefundState
())
.
successTime
(
vo
.
getSuccessTime
())
.
successTime
(
vo
.
getSuccessTime
())
.
build
();
.
build
();
}
}
public
static
String
replaceFailMessage
(
String
failMessage
)
{
return
RefundFailMessageReplaceEnums
.
convertBySource
(
failMessage
);
}
public
static
StudioMerchantCheckRefundVO
convertRefundVO
(
CheckRefundCodeEnum
code
)
{
public
static
StudioMerchantCheckRefundVO
convertRefundVO
(
CheckRefundCodeEnum
code
)
{
return
StudioMerchantCheckRefundVO
.
builder
().
code
(
code
.
getCode
()).
failMessage
(
code
.
getMessage
()).
build
();
return
StudioMerchantCheckRefundVO
.
builder
().
code
(
code
.
getCode
()).
failMessage
(
code
.
getMessage
()).
build
();
}
}
...
...
service/src/main/java/com/jiejing/fitness/finance/service/pay/enums/RefundFailMessageReplaceEnums.java
0 → 100644
View file @
dcb71385
package
com
.
jiejing
.
fitness
.
finance
.
service
.
pay
.
enums
;
import
com.jiejing.common.utils.text.StringUtil
;
import
java.util.Arrays
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
/**
* @author chengyubing
* @since 2024/4/19 12:17
*/
@Getter
@AllArgsConstructor
public
enum
RefundFailMessageReplaceEnums
{
/**
*
*/
OTHER
(
""
,
"退款失败,请联系小麦乐动工作人员处理。"
),
E1
(
"业务执行失败[可用余额不足]"
,
"当前乐动收银余额不足,无法退款,请在线收款后再次发起退款或者线下处理退款。"
),
;
private
final
String
source
;
private
final
String
target
;
public
static
String
convertBySource
(
String
source
)
{
if
(
StringUtil
.
isBlank
(
source
))
{
return
null
;
}
return
Arrays
.
stream
(
RefundFailMessageReplaceEnums
.
values
())
.
filter
(
e
->
OTHER
!=
e
)
.
filter
(
e
->
e
.
getSource
().
contains
(
source
)
||
source
.
contains
(
e
.
getSource
())).
findFirst
()
.
orElse
(
OTHER
).
getTarget
();
}
}
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