Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sbkpay
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
sbkpay
Commits
bc2e9cbb
Commit
bc2e9cbb
authored
Sep 07, 2017
by
李定达
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修复支付中扫码界面异常bug
parent
b4d74f5e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
sbkpay/control.cpp
+2
-1
sbkpay/hostwidget.cpp
+3
-3
sbkpay/main.cpp
+2
-1
sbkpay/sbkpay.pro.user
+1
-1
No files found.
sbkpay/control.cpp
View file @
bc2e9cbb
...
@@ -153,9 +153,10 @@ bool Control::SendMessageToPayMent(const QJsonObject &json, QByteArray &outdata,
...
@@ -153,9 +153,10 @@ bool Control::SendMessageToPayMent(const QJsonObject &json, QByteArray &outdata,
QByteArray
data
=
QJsonDocument
(
tmpjson
).
toJson
(
QJsonDocument
::
Compact
);
QByteArray
data
=
QJsonDocument
(
tmpjson
).
toJson
(
QJsonDocument
::
Compact
);
if
(
!
Control
::
HttpPost
(
url
,
array
,
data
,
"application/json;charset=utf-8"
,
"application/json"
,
error
,
60
))
if
(
!
Control
::
HttpPost
(
url
,
array
,
data
,
"application/json;charset=utf-8"
,
"application/json"
,
error
,
60
))
{
{
if
(
!
_isinterrupt
)
if
(
!
_isinterrupt
)
{
{
//如果没有点击取消支付按钮直接写数据库异步冲正
if
(
json
.
contains
(
JSON_KEY_REQTYPE
)
&&
json
[
JSON_KEY_REQTYPE
].
toInt
()
==
72
)
if
(
json
.
contains
(
JSON_KEY_REQTYPE
)
&&
json
[
JSON_KEY_REQTYPE
].
toInt
()
==
72
)
{
{
QVariantHash
hash
;
QVariantHash
hash
;
...
...
sbkpay/hostwidget.cpp
View file @
bc2e9cbb
...
@@ -141,8 +141,8 @@ void HostWidget::keyPressEvent(QKeyEvent *ke)
...
@@ -141,8 +141,8 @@ void HostWidget::keyPressEvent(QKeyEvent *ke)
// emit RequestWithType(refund, list);
// emit RequestWithType(refund, list);
}
}
}
else
}
/*
else
emit
Exits
();
emit Exits();
*/
}
}
else
else
{
{
...
@@ -527,7 +527,7 @@ void HostWidget::on_btn_sign_exit_clicked()
...
@@ -527,7 +527,7 @@ void HostWidget::on_btn_sign_exit_clicked()
if
(
_need_exit
)
if
(
_need_exit
)
emit
Exits
();
emit
Exits
();
else
else
emit
ExitWithMSG
(
"0
1
"
,
QString
::
fromLocal8Bit
(
"收银员取消"
));
emit
ExitWithMSG
(
"0
2
"
,
QString
::
fromLocal8Bit
(
"收银员取消"
));
}
}
void
HostWidget
::
on_btn_sign_sign_clicked
()
void
HostWidget
::
on_btn_sign_sign_clicked
()
...
...
sbkpay/main.cpp
View file @
bc2e9cbb
...
@@ -337,7 +337,8 @@ int main(int argc, char *argv[])
...
@@ -337,7 +337,8 @@ int main(int argc, char *argv[])
FMTool
::
SetString
(
req
.
CashTraceNo
,
6
,
QString
(
"16723"
));
FMTool
::
SetString
(
req
.
CashTraceNo
,
6
,
QString
(
"16723"
));
FMTool
::
SetString
(
req
.
OriginTrace
,
64
,
QString
(
""
));
FMTool
::
SetString
(
req
.
OriginTrace
,
64
,
QString
(
""
));
FMTool
::
SetString
(
req
.
Amount
,
12
,
QString
(
"1"
));
FMTool
::
SetString
(
req
.
Amount
,
12
,
QString
(
"1"
));
FMTool
::
SetString
(
req
.
Reserved1
,
48
,
QString
(
"1367623098735894422"
));
FMTool
::
SetString
(
req
.
Reserved1
,
48
,
QString
(
"136991574"
"98735894422"
));
req
.
item_line_qty
[
0
]
=
'2'
;
req
.
item_line_qty
[
0
]
=
'2'
;
req
.
item_line_qty
[
1
]
=
' '
;
req
.
item_line_qty
[
1
]
=
' '
;
...
...
sbkpay/sbkpay.pro.user
View file @
bc2e9cbb
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.5.1, 2017-09-0
3T16:46:48
. -->
<!-- Written by QtCreator 3.5.1, 2017-09-0
7T10:02:46
. -->
<qtcreator>
<qtcreator>
<data>
<data>
<variable>
EnvironmentId
</variable>
<variable>
EnvironmentId
</variable>
...
...
zhenfei.zhang
@zhenfei.zhang
mentioned in commit
35113112
Jan 03, 2018
mentioned in commit
35113112
mentioned in commit 35113112645aa22e5ae82cae9092990824d451d1
Toggle commit list
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