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
99163eb5
Commit
99163eb5
authored
Aug 02, 2017
by
Carwyn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修正不传商品列表问题; 2. 按 ESC 正常退出;
parent
c03b2439
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
fmp_epay.cpp
+2
-0
fmp_epay_p.cpp
+2
-1
fmp_epayview_dialog.cpp
+3
-1
version.h
+1
-1
No files found.
fmp_epay.cpp
View file @
99163eb5
...
@@ -22,12 +22,14 @@ FMPePay::FMPePay(ctkPluginContext *context)
...
@@ -22,12 +22,14 @@ FMPePay::FMPePay(ctkPluginContext *context)
_ste_handler
(
new
FMPStartEventHandler
(
_ctx
,
this
)),
_ste_handler
(
new
FMPStartEventHandler
(
_ctx
,
this
)),
d_ptr
(
new
FMPePayPrivate
(
this
))
d_ptr
(
new
FMPePayPrivate
(
this
))
{
{
FMPLoggerInterface
::
InitContext
(
context
);
}
}
FMPePay
::~
FMPePay
()
FMPePay
::~
FMPePay
()
{
{
StopService
();
StopService
();
FMPLoggerInterface
::
InitContext
(
nullptr
,
false
);
if
(
d_ptr
)
{
if
(
d_ptr
)
{
delete
d_ptr
;
delete
d_ptr
;
d_ptr
=
nullptr
;
d_ptr
=
nullptr
;
...
...
fmp_epay_p.cpp
View file @
99163eb5
...
@@ -651,7 +651,8 @@ bool FMPePayPrivate::GetPayJson(const QString& sum, const QString& code)
...
@@ -651,7 +651,8 @@ bool FMPePayPrivate::GetPayJson(const QString& sum, const QString& code)
if
(
_is_api
)
{
if
(
_is_api
)
{
QJsonObject
origin_trans
=
_origin_request
[
"transactions"
].
toObject
();
QJsonObject
origin_trans
=
_origin_request
[
"transactions"
].
toObject
();
transaction
[
FMP_EPAY_TRANSTRACTION_AMOUNT
]
=
(
int
)(
origin_trans
[
"order_amount"
].
toDouble
()
+
0.005
);
transaction
[
FMP_EPAY_TRANSTRACTION_AMOUNT
]
=
(
int
)(
origin_trans
[
"order_amount"
].
toDouble
()
+
0.005
);
QJsonArray
pos_products
=
_origin_request
[
"products"
].
toArray
();
QJsonObject
pos_trans
=
_origin_request
[
"transactions"
].
toObject
();
QJsonArray
pos_products
=
pos_trans
[
"products"
].
toArray
();
QJsonArray
products
;
QJsonArray
products
;
int
i
=
1
;
int
i
=
1
;
foreach
(
QJsonValue
v
,
pos_products
)
{
foreach
(
QJsonValue
v
,
pos_products
)
{
...
...
fmp_epayview_dialog.cpp
View file @
99163eb5
...
@@ -313,7 +313,9 @@ void FMPPayDialog::onSelectionChanged(QModelIndex idx)
...
@@ -313,7 +313,9 @@ void FMPPayDialog::onSelectionChanged(QModelIndex idx)
void
FMPPayDialog
::
keyPressEvent
(
QKeyEvent
*
e
)
void
FMPPayDialog
::
keyPressEvent
(
QKeyEvent
*
e
)
{
{
return
QDialog
::
keyPressEvent
(
e
);
if
(
e
->
key
()
==
Qt
::
Key_Escape
)
{
on_btn_close_clicked
();
}
}
}
void
FMPPayDialog
::
mousePressEvent
(
QMouseEvent
*
event
)
void
FMPPayDialog
::
mousePressEvent
(
QMouseEvent
*
event
)
...
...
version.h
View file @
99163eb5
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
#define VER_MINOR 1
#define VER_MINOR 1
#define VER_REVISION 0
#define VER_REVISION 0
#define VER_BUILD 1
2
#define VER_BUILD 1
4
//! Convert version numbers to string
//! Convert version numbers to string
#define _STR(S) #S
#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