Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
FMVip_LXJ
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
FMVip_LXJ
Commits
c4310cba
Commit
c4310cba
authored
Jan 12, 2017
by
NitefullWind
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 修复pay_ids拼写问题。 2. pos传来数据编码转成utf8.
parent
e0532a6c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
FMVip_LXJ/fmvipdispatcher.cpp
+1
-2
FMVip_LXJ/task/taskpay.cpp
+1
-1
No files found.
FMVip_LXJ/fmvipdispatcher.cpp
View file @
c4310cba
...
...
@@ -29,9 +29,8 @@ BOOL FMVipDispatcher::Transfer(LPSTR data, LPSTR &rsp, UINT &rsp_len)
{
if
(
strcmp
(
data
,
QuitCMD
)
!=
0
)
{
emit
startSocketTimer
();
mutex
.
lock
();
reqData
=
Q
ByteArray
(
data
);
reqData
=
Q
String
::
fromLocal8Bit
(
data
).
toUtf8
(
);
emit
doTask
();
condition
.
wait
(
&
mutex
);
mutex
.
unlock
();
...
...
FMVip_LXJ/task/taskpay.cpp
View file @
c4310cba
...
...
@@ -85,7 +85,7 @@ void TaskPay::packagePOSRsp()
pay_id
[
PosProps
.
Coupon_code
]
=
cp
[
ServerProps
(
PosProps
.
Coupon_code
)];
pay_ids
.
append
(
pay_id
);
}
posRspJsonObj
[
PosProps
.
Pay_id
]
=
pay_ids
;
posRspJsonObj
[
PosProps
.
Pay_id
s
]
=
pay_ids
;
posRspJsonObj
[
"total_amount"
]
=
session
()
->
data
(
PosProps
.
OrderAmount
).
toInt
();
posRspJsonObj
[
PosProps
.
Paid_total_amount
]
=
paidTotalAmount
;
posRspJsonObj
[
"invoice_amount"
]
=
paidTotalAmount
;
...
...
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