Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Jeepay
Commits
3036d5fc
Commit
3036d5fc
authored
Aug 12, 2021
by
terrfly
Browse files
仅支付订单更改为已发送,其他订单不考虑该字段
parent
dae2d4a6
Changes
4
Hide whitespace changes
Inline
Side-by-side
docs/sql/init.sql
View file @
3036d5fc
...
...
@@ -385,7 +385,6 @@ CREATE TABLE `t_transfer_order` (
`transfer_desc`
VARCHAR
(
128
)
NOT
NULL
DEFAULT
''
COMMENT
'转账备注信息'
,
`client_ip`
VARCHAR
(
32
)
DEFAULT
NULL
COMMENT
'客户端IP'
,
`state`
TINYINT
(
6
)
NOT
NULL
DEFAULT
'0'
COMMENT
'支付状态: 0-订单生成, 1-转账中, 2-转账成功, 3-转账失败, 4-订单关闭'
,
`notify_state`
TINYINT
(
6
)
NOT
NULL
DEFAULT
'0'
COMMENT
'向下游回调状态, 0-未发送, 1-已发送'
,
`channel_extra`
VARCHAR
(
512
)
DEFAULT
NULL
COMMENT
'特定渠道发起额外参数'
,
`channel_order_no`
VARCHAR
(
64
)
DEFAULT
NULL
COMMENT
'渠道订单号'
,
`err_code`
VARCHAR
(
128
)
DEFAULT
NULL
COMMENT
'渠道支付错误码'
,
...
...
jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/TransferOrder.java
View file @
3036d5fc
...
...
@@ -142,11 +142,6 @@ public class TransferOrder implements Serializable {
*/
private
Byte
state
;
/**
* 向下游回调状态, 0-未发送, 1-已发送
*/
private
Byte
notifyState
;
/**
* 特定渠道发起额外参数
*/
...
...
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/mq/PayOrderMchNotifyMQReceiver.java
View file @
3036d5fc
...
...
@@ -74,7 +74,8 @@ public class PayOrderMchNotifyMQReceiver implements PayOrderMchNotifyMQ.IMQRecei
res
=
"连接["
+
UrlBuilder
.
of
(
notifyUrl
).
getHost
()
+
"]异常:【"
+
e
.
getMessage
()
+
"】"
;
}
if
(
currentCount
==
1
){
//第一次通知: 更新为已通知
//支付订单 & 第一次通知: 更新为已通知
if
(
currentCount
==
1
&&
MchNotifyRecord
.
TYPE_PAY_ORDER
==
record
.
getOrderType
()){
payOrderService
.
updateNotifySent
(
record
.
getOrderId
());
}
...
...
jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/TransferOrderMapper.xml
View file @
3036d5fc
...
...
@@ -21,7 +21,6 @@
<result
column=
"transfer_desc"
property=
"transferDesc"
/>
<result
column=
"client_ip"
property=
"clientIp"
/>
<result
column=
"state"
property=
"state"
/>
<result
column=
"notify_state"
property=
"notifyState"
/>
<result
column=
"channel_extra"
property=
"channelExtra"
/>
<result
column=
"channel_order_no"
property=
"channelOrderNo"
/>
<result
column=
"err_code"
property=
"errCode"
/>
...
...
Write
Preview
Supports
Markdown
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