列表展示

cquerythread.cpp

 #include "cquerythread.h"
 
 CQueryThread::CQueryThread(FMPePayPrivate *fmPay)
-    :_fmPay(fmPay)
+    : QThread(),
+      _fmPay(fmPay)
     ,_iReqCount(0)
     ,_run(false)
 {
 
 }
 
+CQueryThread::~CQueryThread()
+{
+
+}
+
 void CQueryThread::run()
 {
     while (_run) {
@@ -22,6 +28,7 @@ void CQueryThread::trySend()
     QJsonObject outjson;
     _query_request["clientReqCount"]=_iReqCount+1;
 
+    FMP_INFO() << "QThread trySend:" << _query_request;
     _fmPay->HttpPost(outjson, _query_request ,errors);
     if(outjson[FMP_RPAY_PAY_RETURN_STATUSCODE].toInt() != 102){
         _run=false;

cquerythread.h

@@ -9,6 +9,7 @@ class CQueryThread:public QThread
 {
 public:
     CQueryThread(FMPePayPrivate *fmPay);
+    virtual ~CQueryThread();
     void run();
     void trySend();
 

fmp_epay_p.h

@@ -75,7 +75,12 @@ private:
 
     void                clearorder();
 
-    void                SendToMonitor(const QByteArray &data);
+    bool                SendToMonitor(const QByteArray &data);
+
+    void                HttpPost(const QString &url, const QByteArray &data, QFutureWatcher<QByteArray> *furture, int timeout = 10);
+
+    void                CheckErrorOrder();   //查询异常订单，如果有异常订单，则进入查询状态
+
 signals:
     void                apiError();
     void                apiFinish();
@@ -97,12 +102,6 @@ public:
     bool                _is_api;
     CQueryThread        *_queryThread;
 private:
-    QJsonObject         _origin_request;
-    QJsonObject         _docked_request;
-    QJsonObject         _origin_response;
-    QJsonObject         _docked_response;
-
-
     bool                _reverse_flag;
 
     static unsigned int s_ClientReqCount;
@@ -112,9 +111,12 @@ private:
     QSqlTableModel *_model;
 
     QFutureWatcher<QByteArray> *_watcher;
+    QJsonObject         _origin_request;
+    QJsonObject         _docked_request;
+    QJsonObject         _origin_response;
+    QJsonObject         _docked_response;
 
-    void HttpPost(const QString &url, const QByteArray &data, QFutureWatcher<QByteArray> *furture, int timeout = 10);
-
+    QString             _pos_trans_id;
 };
 
 #endif // FMP_EPAY_P_H

fmp_epayview_dialog.cpp

@@ -189,7 +189,7 @@ void FMPPayDialog::setTableHeader()
     model_done->setHeaderData(4, Qt::Horizontal, QString::fromLocal8Bit("交易渠道"));
     model_done->setHeaderData(6, Qt::Horizontal, QString::fromLocal8Bit("金额(元)"));
     model_done->setHeaderData(14, Qt::Horizontal, QString::fromLocal8Bit("状态"));
-    model_done->setHeaderData(15, Qt::Horizontal, QString::fromLocal8Bit("交易时间"));
+    model_done->setHeaderData(16, Qt::Horizontal, QString::fromLocal8Bit("交易时间"));
 
     QVector<QTableView*> vecTables;
     vecTables.push_back(ui->tableView_Done);
@@ -210,9 +210,11 @@ void FMPPayDialog::setTableHeader()
         vecTables[i]->hideColumn(11);
         vecTables[i]->hideColumn(12);
         vecTables[i]->hideColumn(13);
+        vecTables[i]->hideColumn(15);
 
         vecTables[i]->setSelectionMode(QTableView::SingleSelection);
         vecTables[i]->setSelectionBehavior(QTableView::SelectRows);
+        vecTables[i]->setEditTriggers(QTableView::NoEditTriggers);
 
         vecTables[i]->verticalHeader()->setVisible(false);
         QHeaderView *header_done = vecTables[i]->horizontalHeader();
@@ -220,7 +222,7 @@ void FMPPayDialog::setTableHeader()
         vecTables[i]->setColumnWidth(4, 150);
         vecTables[i]->setColumnWidth(6, 70);
         vecTables[i]->setColumnWidth(14, 90);
-        vecTables[i]->setColumnWidth(15, 160);
+        vecTables[i]->setColumnWidth(16, 160);
 
         header_done->setVisible(true);
         header_done->setStretchLastSection(true);
@@ -333,14 +335,23 @@ void FMPPayDialog::showErrorMsg(QString errormsg)
     if(errormsg == "")
         errormsg = QString("");
 
+    if(_wait == NULL)
+    {
+        _wait = new FMPPayWait(this);
+        _wait->setModal(true);
+    }
     if(_control->_is_api){
-        if(_wait)
-            _wait->hide();
+        _wait->SetContent(FMPPayWait::ERRORS, errormsg);
 
-        FMPPayFailedDialog  *_pay_failed=new FMPPayFailedDialog(this);
-        _pay_failed->setModal(true);
-        _pay_failed->show();
-        _pay_failed->SetContent(errormsg,ui->lineedit_num->text());
+        if(_wait->isHidden())
+            _wait->show();
+//        if(_wait)
+//            _wait->hide();
+
+//        FMPPayFailedDialog  *_pay_failed=new FMPPayFailedDialog(this);
+//        _pay_failed->setModal(true);
+//        _pay_failed->show();
+//        _pay_failed->SetContent(errormsg,ui->lineedit_num->text());
     }
 	else{
 	    _wait->SetContent(FMPPayWait::ERRORS, errormsg);
@@ -811,6 +822,10 @@ void FMPPayDialog::on_btn_close_clicked()
             _force_close->setModal(true);
             _force_close->show();
 		}
+        else{
+            this->close();
+            _control->Uninit();
+        }
 	}
 }
 
@@ -951,6 +966,7 @@ void FMPPayDialog::on_btn_waitPay_close_clicked()
     QJsonObject queryObj;
     queryObj[FMP_EPAY_TRANSID]=orderId;
     queryObj[FMP_RPAY_PAY_RETURN_STATUSCODE]=108;
+    queryObj["msg"]=QString::fromLocal8Bit("关闭订单");
 
     _control->updateSqlite(queryObj);
     setWaitPayView();

fmp_epayview_dialog.ui

@@ -3268,10 +3268,10 @@ QHeaderView::section {
             <zorder>wdg_refund_main</zorder>
             <zorder>wdg_done_main</zorder>
             <zorder>wdg_hasPay_main</zorder>
-            <zorder>wdg_pay_main</zorder>
             <zorder>wdg_query_main</zorder>
             <zorder>wdg_success_main</zorder>
             <zorder>wdg_waitPay_main</zorder>
+            <zorder>wdg_pay_main</zorder>
            </widget>
           </item>
           <item>

version.h

@@ -5,7 +5,7 @@
 #define VER_MINOR 1
 #define VER_REVISION 0
 
-#define VER_BUILD 14
+#define VER_BUILD 15
 
 //! Convert version numbers to string
 #define _STR(S)  #S