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
fbe1ef2f
Commit
fbe1ef2f
authored
Oct 30, 2017
by
NitefullWind
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 修复应付金额Bug。
parent
f58de8d8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
3 deletions
+11
-3
fmp_epay_p.cpp
+2
-2
fmp_epayview_dialog.cpp
+6
-0
fmp_epayview_dialog.h
+2
-0
version.h
+1
-1
No files found.
fmp_epay_p.cpp
View file @
fbe1ef2f
...
@@ -694,8 +694,8 @@ bool FMPePayPrivate::GetPayJson(const QString& sum, const QString& code)
...
@@ -694,8 +694,8 @@ bool FMPePayPrivate::GetPayJson(const QString& sum, const QString& code)
transaction
.
insert
(
FMP_EPAY_TRANSTRACTION_CODE
,
code
);
transaction
.
insert
(
FMP_EPAY_TRANSTRACTION_CODE
,
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
]
=
_payDialog
->
getPayAmount
(
);
QJsonObject
pos_trans
=
_origin_request
[
"transactions"
].
toObject
();
QJsonObject
pos_trans
=
_origin_request
[
"transactions"
].
toObject
();
QJsonArray
pos_products
=
pos_trans
[
"products"
].
toArray
();
QJsonArray
pos_products
=
pos_trans
[
"products"
].
toArray
();
QJsonArray
products
;
QJsonArray
products
;
...
...
fmp_epayview_dialog.cpp
View file @
fbe1ef2f
...
@@ -175,6 +175,12 @@ FMPPayDialog::FMPPayDialog(FMPePayPrivate *control, QVariantHash basicinfo, QWid
...
@@ -175,6 +175,12 @@ FMPPayDialog::FMPPayDialog(FMPePayPrivate *control, QVariantHash basicinfo, QWid
}
}
}
}
int
FMPPayDialog
::
getPayAmount
()
const
{
int
amount
=
ui
->
lineedit_num
->
text
().
toDouble
()
*
100
;
return
amount
;
}
void
FMPPayDialog
::
show
()
void
FMPPayDialog
::
show
()
{
{
...
...
fmp_epayview_dialog.h
View file @
fbe1ef2f
...
@@ -40,6 +40,8 @@ public:
...
@@ -40,6 +40,8 @@ public:
~
FMPPayDialog
();
~
FMPPayDialog
();
int
getPayAmount
()
const
;
public
slots
:
public
slots
:
void
showErrorMsg
(
QString
errormsg
);
void
showErrorMsg
(
QString
errormsg
);
...
...
version.h
View file @
fbe1ef2f
...
@@ -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
19
#define VER_BUILD
20
//! 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