Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmp_epay
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
zhenfei.zhang
fmp_epay
Commits
43a495ac
Commit
43a495ac
authored
Sep 22, 2017
by
Carwyn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修正: 1. 支付后退款填入错误交易号卡死问题
parent
25d5b650
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletions
+3
-1
fmp_epay_p.cpp
+2
-0
version.h
+1
-1
No files found.
fmp_epay_p.cpp
View file @
43a495ac
...
...
@@ -172,6 +172,7 @@ void FMPePayPrivate::Init()
&&
trans
.
contains
(
FMP_JKEY_FM_ORDERID
)
&&
!
trans
[
FMP_JKEY_FM_ORDERID
].
toString
().
isEmpty
()
||
trans
.
contains
(
FMP_JKEY_PAY_TRANSID
)
&&
!
trans
[
FMP_JKEY_PAY_TRANSID
].
toString
().
isEmpty
())
{
connect
(
this
,
&
FMPePayPrivate
::
finished
,
this
,
&
FMPePayPrivate
::
confirmClicked
);
connect
(
this
,
&
FMPePayPrivate
::
error
,
this
,
&
FMPePayPrivate
::
confirmClicked
);
ControlRefundJson
(
trans
);
return
;
}
...
...
@@ -660,6 +661,7 @@ void FMPePayPrivate::ControlRefundJson(const QJsonObject &trans)
}
disconnect
(
this
,
&
FMPePayPrivate
::
finished
,
this
,
&
FMPePayPrivate
::
confirmClicked
);
connect
(
this
,
&
FMPePayPrivate
::
error
,
this
,
&
FMPePayPrivate
::
confirmClicked
);
});
}
...
...
version.h
View file @
43a495ac
...
...
@@ -5,7 +5,7 @@
#define VER_MINOR 1
#define VER_REVISION 0
#define VER_BUILD 1
7
#define VER_BUILD 1
8
//! Convert version numbers to string
#define _STR(S) #S
...
...
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