Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
0a241c4a
提交
0a241c4a
authored
2月 02, 2024
作者:
aiqingguo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
承运借款流程-宁波银行
上级
7883ba26
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
61 行增加
和
45 行删除
+61
-45
NbBankStatusEnum.java
...va/com/clx/performance/enums/nbbank/NbBankStatusEnum.java
+37
-0
NbBankOrderResultVO.java
...com/clx/performance/vo/pc/nbbank/NbBankOrderResultVO.java
+2
-1
TempBankController.java
...m/clx/performance/controller/temp/TempBankController.java
+1
-1
NbBankServiceImpl.java
...nce/service/impl/thirdparty/nbbank/NbBankServiceImpl.java
+21
-43
没有找到文件。
performance-api/src/main/java/com/clx/performance/enums/nbbank/NbBankStatusEnum.java
0 → 100644
浏览文件 @
0a241c4a
package
com
.
clx
.
performance
.
enums
.
nbbank
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
import
java.util.Arrays
;
import
java.util.Optional
;
public
enum
NbBankStatusEnum
{
;
@Getter
@AllArgsConstructor
public
enum
Status
{
TEMP
(
0
,
"中间态"
),
SUCCESS
(
1
,
"交易成功"
),
FAIL
(
2
,
"交易失败"
),
ACCEPT
(
3
,
"交易已受理"
),
INIT
(
4
,
"订单初始状态"
),
NOT_FOUND
(
5
,
"交易不存在"
),
TIMEOUT
(
6
,
"交易超时,须发起交易结果查询"
),
;
private
final
Integer
code
;
private
final
String
msg
;
public
static
Optional
<
Status
>
getByCode
(
int
code
)
{
return
Arrays
.
stream
(
values
()).
filter
(
e
->
e
.
code
==
code
).
findFirst
();
}
public
static
String
getMsgByCode
(
int
code
)
{
return
getByCode
(
code
).
map
(
Status:
:
getMsg
).
orElse
(
null
);
}
}
}
performance-api/src/main/java/com/clx/performance/vo/pc/nbbank/NbBankOrderResultVO.java
浏览文件 @
0a241c4a
...
...
@@ -34,6 +34,6 @@ public class NbBankOrderResultVO {
private
String
signNo
;
@ApiModelProperty
(
value
=
"交易状态:1交易成功 2交易失败 3交易已受理 4订单初始状态 5交易不存在 6交易超时"
,
example
=
"1"
)
private
Integer
transS
tatus
;
private
Integer
s
tatus
;
}
\ No newline at end of file
performance-web/src/main/java/com/clx/performance/controller/temp/TempBankController.java
浏览文件 @
0a241c4a
...
...
@@ -76,7 +76,7 @@ public class TempBankController {
@RequestMapping
(
value
=
"/notify"
,
method
=
RequestMethod
.
POST
)
public
Result
notify
(
NbBankOrderResultVO
param
)
{
bankService
.
orderPayCallback
(
param
.
getMerSeqNo
(),
param
.
getTransSeqNo
(),
param
.
getAmount
(),
param
.
getAmount
(),
param
.
get
Trans
Status
(),
param
.
getSignNo
());
param
.
getAmount
(),
param
.
getAmount
(),
param
.
getStatus
(),
param
.
getSignNo
());
return
Result
.
ok
();
}
...
...
performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankServiceImpl.java
浏览文件 @
0a241c4a
...
...
@@ -3,6 +3,7 @@ package com.clx.performance.service.impl.thirdparty.nbbank;
import
com.alibaba.fastjson.JSONObject
;
import
com.clx.performance.component.IdGenerateSnowFlake
;
import
com.clx.performance.enums.PerformanceResultEnum
;
import
com.clx.performance.enums.nbbank.NbBankStatusEnum
;
import
com.clx.performance.service.thirdparty.nbbank.NbBankService
;
import
com.clx.performance.service.thirdparty.nbbank.NbBankThirdpartyService
;
import
com.clx.performance.utils.LocalDateTimeUtils
;
...
...
@@ -15,8 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.time.format.DateTimeFormatter
;
/**
* 易付通
...
...
@@ -103,18 +102,12 @@ public class NbBankServiceImpl implements NbBankService {
NbBankOrderResultVO
result
=
new
NbBankOrderResultVO
();
String
transStatus
=
data
.
getString
(
"transStatus"
);
if
(
StringUtils
.
equals
(
transStatus
,
"00"
)){
result
.
setTransStatus
(
1
);}
//交易成功
else
if
(
StringUtils
.
equals
(
transStatus
,
"01"
)){
result
.
setTransStatus
(
2
);}
//交易失败
else
if
(
StringUtils
.
equals
(
transStatus
,
"02"
)){
result
.
setTransStatus
(
3
);}
//交易已受理
else
if
(
StringUtils
.
equals
(
transStatus
,
"80"
)){
result
.
setTransStatus
(
4
);}
//订单初始状态
else
if
(
StringUtils
.
equals
(
transStatus
,
"90"
)){
result
.
setTransStatus
(
5
);}
//交易不存在
else
if
(
StringUtils
.
equals
(
transStatus
,
"99"
)){
result
.
setTransStatus
(
6
);}
//交易超时,须发起交易结果查询
BigDecimal
trxAmt
=
data
.
getBigDecimal
(
"trxAmt"
);
BigDecimal
realTrxAmt
=
data
.
getBigDecimal
(
"realTrxAmt"
);
String
transSeqNo
=
data
.
getString
(
"transSeqNo"
);
String
signNo
=
data
.
getString
(
"signNo"
);
result
.
setStatus
(
getStatus
(
transStatus
));
result
.
setAmount
(
trxAmt
==
null
?
null
:
trxAmt
.
movePointLeft
(
2
).
intValue
());
result
.
setRealAmount
(
realTrxAmt
==
null
?
null
:
realTrxAmt
.
movePointLeft
(
2
).
intValue
());
result
.
setMerSeqNo
(
orgMerSeqNo
);
...
...
@@ -139,15 +132,9 @@ public class NbBankServiceImpl implements NbBankService {
NbBankOrderResultVO
result
=
new
NbBankOrderResultVO
();
String
transStatus
=
data
.
getString
(
"transStatus"
);
if
(
StringUtils
.
equals
(
transStatus
,
"00"
)){
result
.
setTransStatus
(
1
);}
//交易成功
else
if
(
StringUtils
.
equals
(
transStatus
,
"01"
)){
result
.
setTransStatus
(
2
);}
//交易失败
else
if
(
StringUtils
.
equals
(
transStatus
,
"02"
)){
result
.
setTransStatus
(
3
);}
//交易已受理
else
if
(
StringUtils
.
equals
(
transStatus
,
"80"
)){
result
.
setTransStatus
(
4
);}
//订单初始状态
else
if
(
StringUtils
.
equals
(
transStatus
,
"90"
)){
result
.
setTransStatus
(
5
);}
//交易不存在
else
if
(
StringUtils
.
equals
(
transStatus
,
"99"
)){
result
.
setTransStatus
(
6
);}
//交易超时,须发起交易结果查询
String
transSeqNo
=
data
.
getString
(
"transSeqNo"
);
result
.
setStatus
(
getStatus
(
transStatus
));
result
.
setAmount
(
amount
);
result
.
setRealAmount
(
amount
);
result
.
setMerDtTm
(
merDtTm
);
...
...
@@ -175,15 +162,9 @@ public class NbBankServiceImpl implements NbBankService {
NbBankOrderResultVO
result
=
new
NbBankOrderResultVO
();
String
transStatus
=
data
.
getString
(
"transStatus"
);
if
(
StringUtils
.
equals
(
transStatus
,
"00"
)){
result
.
setTransStatus
(
1
);}
//交易成功
else
if
(
StringUtils
.
equals
(
transStatus
,
"01"
)){
result
.
setTransStatus
(
2
);}
//交易失败
else
if
(
StringUtils
.
equals
(
transStatus
,
"02"
)){
result
.
setTransStatus
(
3
);}
//交易已受理
else
if
(
StringUtils
.
equals
(
transStatus
,
"80"
)){
result
.
setTransStatus
(
4
);}
//订单初始状态
else
if
(
StringUtils
.
equals
(
transStatus
,
"90"
)){
result
.
setTransStatus
(
5
);}
//交易不存在
else
if
(
StringUtils
.
equals
(
transStatus
,
"99"
)){
result
.
setTransStatus
(
6
);}
//交易超时,须发起交易结果查询
String
transSeqNo
=
data
.
getString
(
"transSeqNo"
);
result
.
setStatus
(
getStatus
(
transStatus
));
result
.
setAmount
(
amount
);
result
.
setRealAmount
(
amount
);
result
.
setMerDtTm
(
merDtTm
);
...
...
@@ -211,29 +192,11 @@ public class NbBankServiceImpl implements NbBankService {
merSeqNo
,
transSeqNo
,
trxAmt
,
realTrxAmt
,
transStatus
,
signNo
);
NbBankOrderResultVO
result
=
new
NbBankOrderResultVO
();
if
(
StringUtils
.
equals
(
transStatus
,
"00"
)){
//交易成功
result
.
setTransStatus
(
1
);
}
if
(
StringUtils
.
equals
(
transStatus
,
"01"
)){
//交易失败
result
.
setTransStatus
(
2
);
}
if
(
StringUtils
.
equals
(
transStatus
,
"02"
)){
//交易已受理
result
.
setTransStatus
(
3
);
}
if
(
StringUtils
.
equals
(
transStatus
,
"80"
)){
//订单初始状态
result
.
setTransStatus
(
4
);
}
if
(
StringUtils
.
equals
(
transStatus
,
"90"
)){
//交易不存在
result
.
setTransStatus
(
5
);
}
if
(
StringUtils
.
equals
(
transStatus
,
"99"
)){
//交易超时,须发起交易结果查询
result
.
setTransStatus
(
6
);
}
result
.
setStatus
(
getStatus
(
transStatus
));
orderPayCallback
(
merSeqNo
,
transSeqNo
,
trxAmt
,
realTrxAmt
,
result
.
get
Trans
Status
(),
signNo
);
orderPayCallback
(
merSeqNo
,
transSeqNo
,
trxAmt
,
realTrxAmt
,
result
.
getStatus
(),
signNo
);
}
/**
* 银行回调
* @param merSeqNo 商户流水号
...
...
@@ -260,4 +223,19 @@ public class NbBankServiceImpl implements NbBankService {
return
StringUtils
.
isBlank
(
signNo
)?
StringUtils
.
right
(
cardNo
,
7
)
:
signNo
;
}
/**
* 获取订单状态
*/
private
Integer
getStatus
(
String
transStatus
){
if
(
StringUtils
.
equals
(
transStatus
,
"00"
)){
return
NbBankStatusEnum
.
Status
.
SUCCESS
.
getCode
();}
//交易成功
else
if
(
StringUtils
.
equals
(
transStatus
,
"01"
)){
return
NbBankStatusEnum
.
Status
.
FAIL
.
getCode
();}
//交易失败
else
if
(
StringUtils
.
equals
(
transStatus
,
"02"
)){
return
NbBankStatusEnum
.
Status
.
ACCEPT
.
getCode
();}
//交易已受理
else
if
(
StringUtils
.
equals
(
transStatus
,
"80"
)){
return
NbBankStatusEnum
.
Status
.
INIT
.
getCode
();}
//订单初始状态
else
if
(
StringUtils
.
equals
(
transStatus
,
"90"
)){
return
NbBankStatusEnum
.
Status
.
NOT_FOUND
.
getCode
();}
//交易不存在
else
if
(
StringUtils
.
equals
(
transStatus
,
"99"
)){
return
NbBankStatusEnum
.
Status
.
TIMEOUT
.
getCode
();}
//交易超时,须发起交易结果查询
return
NbBankStatusEnum
.
Status
.
TEMP
.
getCode
();
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论