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
ede00e4a
Commit
ede00e4a
authored
Aug 22, 2017
by
NitefullWind
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 修复支付、结算时,商品信息传输错误的问题。
parent
4df412ec
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
global.h
+1
-0
task/taskfinal.cpp
+2
-2
task/taskpay.cpp
+2
-2
No files found.
global.h
View file @
ede00e4a
...
...
@@ -250,6 +250,7 @@ const PropsMap::value_type PropsMapPairs[] =
PropsMap
::
value_type
(
PosProps
.
OrderAmount
,
"totalAmount"
),
PropsMap
::
value_type
(
PosProps
.
Pay_id
,
"typeModeFlag"
),
PropsMap
::
value_type
(
PosProps
.
Pay_amount
,
"amount"
),
PropsMap
::
value_type
(
PosProps
.
ConsumeNum
,
"consumeNum"
),
};
static
PropsMap
PosToServerProps
(
PropsMapPairs
,
PropsMapPairs
+
(
sizeof
(
PropsMapPairs
)
/
sizeof
(
PropsMapPairs
[
0
])));
...
...
task/taskfinal.cpp
View file @
ede00e4a
...
...
@@ -34,8 +34,8 @@ void TaskFinal::packageServerReq()
foreach
(
auto
p
,
getPosJsonValue
(
"products"
).
toArray
())
{
QJsonObject
product
;
product
[
"consumNum"
]
=
p
.
toObject
()[
"consume_num"
];
int
price
=
p
.
toObject
()[
"price"
].
toInt
()
*
100
;
product
[
ServerProps
(
PosProps
.
ConsumeNum
)]
=
p
.
toObject
()[
PosProps
.
ConsumeNum
];
int
price
=
p
.
toObject
()[
"price"
].
toInt
();
product
[
"price"
]
=
price
;
product
[
"productId"
]
=
p
.
toObject
()[
"pid"
];
...
...
task/taskpay.cpp
View file @
ede00e4a
...
...
@@ -78,8 +78,8 @@ void TaskPay::packageServerReq()
{
QJsonObject
obj
=
clientArray
[
i
].
toObject
();
QJsonObject
serverObj
;
serverObj
[
"consumeNum"
]
=
obj
[
"consume_num"
];
int
price
=
obj
[
"price"
].
toInt
()
*
100
;
serverObj
[
ServerProps
(
PosProps
.
ConsumeNum
)]
=
obj
[
PosProps
.
ConsumeNum
];
int
price
=
obj
[
"price"
].
toInt
();
serverObj
[
"price"
]
=
price
;
serverObj
[
"productId"
]
=
obj
[
"pid"
];
products
.
push_back
(
serverObj
);
...
...
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