Commit bc2e9cbb by 李定达

1.修复支付中扫码界面异常bug

parent b4d74f5e
...@@ -156,6 +156,7 @@ bool Control::SendMessageToPayMent(const QJsonObject &json, QByteArray &outdata, ...@@ -156,6 +156,7 @@ bool Control::SendMessageToPayMent(const QJsonObject &json, QByteArray &outdata,
{ {
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;
......
...@@ -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("01", QString::fromLocal8Bit("收银员取消")); emit ExitWithMSG("02", QString::fromLocal8Bit("收银员取消"));
} }
void HostWidget::on_btn_sign_sign_clicked() void HostWidget::on_btn_sign_sign_clicked()
......
...@@ -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] = ' ';
......
<?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-03T16:46:48. --> <!-- Written by QtCreator 3.5.1, 2017-09-07T10:02:46. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment