Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmp_vip
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
xiaojing.zhang
fmp_vip
Commits
6faf23e7
Commit
6faf23e7
authored
Sep 23, 2017
by
Carwyn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修正: 1. 支付、结算金额精度问题
parent
342f8b2c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
task/taskfinal.cpp
+4
-2
task/taskpay.cpp
+2
-2
No files found.
task/taskfinal.cpp
View file @
6faf23e7
...
...
@@ -28,7 +28,9 @@ void TaskFinal::packageServerReq()
transData
[
ServerProps
(
prop
)]
=
getPosJsonValue
(
prop
);
}
int
orderAmount
=
getPosJsonValue
(
PosProps
.
OrderAmount
).
toDouble
();
int
orderAmount
=
(
getPosJsonValue
(
PosProps
.
OrderAmount
).
toDouble
()
+
0.005
);
//! 金额精度问题
transData
[
ServerProps
(
PosProps
.
OrderAmount
)]
=
orderAmount
;
if
(
transData
[
ServerProps
(
PosProps
.
PaidAmount
)].
toInt
()
==
0
)
{
transData
[
ServerProps
(
PosProps
.
PaidAmount
)]
=
orderAmount
;
...
...
@@ -53,7 +55,7 @@ void TaskFinal::packageServerReq()
foreach
(
auto
p
,
getPosJsonValue
(
PosProps
.
Pay_ids
).
toArray
())
{
QJsonObject
pay
;
int
payAmount
=
p
.
toObject
()[
"pay_amount"
].
toDouble
(
);
int
payAmount
=
(
p
.
toObject
()[
"pay_amount"
].
toDouble
()
+
0.005
);
payTotalAmount
+=
payAmount
;
pay
[
"amount"
]
=
payAmount
;
pay
[
"thirdPayTransId"
]
=
p
.
toObject
()[
"pay_transId"
].
toString
();
...
...
task/taskpay.cpp
View file @
6faf23e7
...
...
@@ -65,13 +65,13 @@ void TaskPay::setWindow()
_window
=
new
FMVipOrder
;
int
amount
=
getPosJsonValue
(
PosProps
.
OrderAmount
).
toInt
();
if
(
amount
==
0
)
{
amount
=
getPosJsonValue
(
PosProps
.
OrderAmount
).
toDouble
()
;
amount
=
(
getPosJsonValue
(
PosProps
.
OrderAmount
).
toDouble
()
+
0.005
);
;
}
//! 临时取 OrderAmount !!!!
int
paid_amount
=
getPosJsonValue
(
PosProps
.
OrderAmount
).
toInt
();
if
(
paid_amount
==
0
)
{
paid_amount
=
getPosJsonValue
(
PosProps
.
OrderAmount
).
toDouble
(
);
paid_amount
=
(
getPosJsonValue
(
PosProps
.
OrderAmount
).
toDouble
()
+
0.005
);
}
session
()
->
addData
(
PosProps
.
OrderAmount
,
amount
);
session
()
->
addData
(
PosProps
.
OrderAmount
,
paid_amount
);
...
...
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