Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmPOS
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
fmPOS
Commits
8c451a96
Commit
8c451a96
authored
Nov 16, 2018
by
刘帅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
面值、实付字段错误
parent
75a22813
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
fmp_redeem/fmp_redeem.cpp
+3
-3
fmp_redeem/version.h
+1
-1
No files found.
fmp_redeem/fmp_redeem.cpp
View file @
8c451a96
...
@@ -297,12 +297,12 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
...
@@ -297,12 +297,12 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
QString
ebcode
=
codeInfo
[
"ebcode"
].
toString
();
QString
ebcode
=
codeInfo
[
"ebcode"
].
toString
();
QString
ebname
=
codeInfo
[
"ebname"
].
toString
();
QString
ebname
=
codeInfo
[
"ebname"
].
toString
();
QString
channel
=
json
[
"channel"
].
toString
();
QString
channel
=
json
[
"channel"
].
toString
();
double
realAmount
=
codeInfo
[
"amount"
].
toInt
()
/
100.0
;
double
realAmount
=
codeInfo
[
"amount"
].
toInt
()
/
100.0
;
// 面值
double
amount
=
codeInfo
[
"paid"
].
toInt
()
/
100.0
;
double
amount
=
codeInfo
[
"paid"
].
toInt
()
/
100.0
;
//实付
QString
time_name
=
QString
::
fromLocal8Bit
(
"有效期至: "
).
append
(
QDate
::
fromString
(
vdata
,
"yyyyMMdd"
).
toString
(
"yyyy-MM-dd"
));
QString
time_name
=
QString
::
fromLocal8Bit
(
"有效期至: "
).
append
(
QDate
::
fromString
(
vdata
,
"yyyyMMdd"
).
toString
(
"yyyy-MM-dd"
));
int
couponType
=
json
[
"couponType"
].
toInt
();
int
couponType
=
json
[
"couponType"
].
toInt
();
if
(
ConsumptionDialog
::
ShowForUnConsum
(
act_name
,
amount
,
realA
mount
,
channel
,
""
,
coupon
))
if
(
ConsumptionDialog
::
ShowForUnConsum
(
act_name
,
realAmount
,
a
mount
,
channel
,
""
,
coupon
))
{
{
_redeem_json
=
QJsonObject
();
_redeem_json
=
QJsonObject
();
_redeem_json
[
"ver"
]
=
2
;
_redeem_json
[
"ver"
]
=
2
;
...
...
fmp_redeem/version.h
View file @
8c451a96
...
@@ -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
83
#define VER_BUILD
90
//! 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