Commit d9052968 by 李定达

1.区分不同界面网络异常提示

parent 5f164e4d
...@@ -164,12 +164,20 @@ bool Control::SendMessageToPayMent(const QJsonObject &json, QByteArray &outdata, ...@@ -164,12 +164,20 @@ bool Control::SendMessageToPayMent(const QJsonObject &json, QByteArray &outdata,
QJsonObject tmpjson = json; QJsonObject tmpjson = json;
CretOperate::GetMAC(tmpjson); CretOperate::GetMAC(tmpjson);
CretOperate::GetSign(tmpjson); CretOperate::GetSign(tmpjson);
bool ispay = false;
QLOG_INFO() << "send json to payment: " << tmpjson; QLOG_INFO() << "send json to payment: " << tmpjson;
if(tmpjson.contains(JSON_KEY_REQTYPE) && tmpjson[JSON_KEY_REQTYPE].toInt() == 72)
ispay = true;
if(tmpjson.contains(JSON_KEY_REQTYPE) && tmpjson[JSON_KEY_REQTYPE].toInt() == 62)
ispay = true;
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, ispay))
{ {
if(!_isinterrupt) if(!_isinterrupt)
{ {
...@@ -195,7 +203,7 @@ bool Control::SendMessageToPayMent(const QJsonObject &json, QByteArray &outdata, ...@@ -195,7 +203,7 @@ bool Control::SendMessageToPayMent(const QJsonObject &json, QByteArray &outdata,
return true; return true;
} }
bool Control::HttpPost(QString url, QByteArray &outdata, const QByteArray &indata, QString content, QString accept, QString &error, int timeout) bool Control::HttpPost(QString url, QByteArray &outdata, const QByteArray &indata, QString content, QString accept, QString &error, int timeout, bool ispay)
{ {
QString path; QString path;
ToolS::GetPath(path); ToolS::GetPath(path);
...@@ -241,7 +249,11 @@ bool Control::HttpPost(QString url, QByteArray &outdata, const QByteArray &indat ...@@ -241,7 +249,11 @@ bool Control::HttpPost(QString url, QByteArray &outdata, const QByteArray &indat
if(reply->error() != QNetworkReply::NoError) if(reply->error() != QNetworkReply::NoError)
{ {
if(ispay)
error = QString::fromLocal8Bit("网路异常.交易失败.如已扣款将会自动返还"); error = QString::fromLocal8Bit("网路异常.交易失败.如已扣款将会自动返还");
else
error = QString::fromLocal8Bit("网络异常,请检查网络后重试");
QLOG_INFO() << reply->errorString() << "Contents: " << reply->readAll(); QLOG_INFO() << reply->errorString() << "Contents: " << reply->readAll();
return false; return false;
} }
...@@ -250,7 +262,10 @@ bool Control::HttpPost(QString url, QByteArray &outdata, const QByteArray &indat ...@@ -250,7 +262,10 @@ bool Control::HttpPost(QString url, QByteArray &outdata, const QByteArray &indat
if(outdata.isEmpty()) if(outdata.isEmpty())
{ {
if(ispay)
error = QString::fromLocal8Bit("网路异常.交易失败.如已扣款将会自动返还"); error = QString::fromLocal8Bit("网路异常.交易失败.如已扣款将会自动返还");
else
error = QString::fromLocal8Bit("网络异常,请检查网络后重试");
QLOG_INFO() << reply->errorString() << "Contents: " << reply->readAll(); QLOG_INFO() << reply->errorString() << "Contents: " << reply->readAll();
return false; return false;
} }
......
...@@ -49,7 +49,7 @@ private: ...@@ -49,7 +49,7 @@ private:
bool GetJson(ReqType type, QJsonObject &json, const QByteArray array, QString &error); bool GetJson(ReqType type, QJsonObject &json, const QByteArray array, QString &error);
bool HttpPost(QString url, QByteArray &outdata, const QByteArray &indata, QString content, QString accept, QString &error, int timeout); bool HttpPost(QString url, QByteArray &outdata, const QByteArray &indata, QString content, QString accept, QString &error, int timeout, bool ispay = false);
bool RollHttpPost(QString url, QByteArray &outdata, const QByteArray &indata, QString content, QString accept, QString &error, int timeout); bool RollHttpPost(QString url, QByteArray &outdata, const QByteArray &indata, QString content, QString accept, QString &error, int timeout);
......
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