1. 修改流水表格界面。 2. 服务端接口支付类型字段修改为String类型。

sbkpay/global.h

@@ -82,6 +82,9 @@
 #define JSON_KEY_BEGINTIME              "beginTime"
 #define JSON_KEY_ENDTIME                "endTime"
 
+#define JSON_KEY_AUTHCODE               "authCode"
+#define JSON_KEY_SALENO                 "saleNo"
+
 #define DEFAULT_JSON_VER_VALUE          3
 #define DEFAULT_JSON_PRODUCTS_NORMAL    "NORMAL"
 #define DEFAULT_JSON_PRODUCTS_FREE      "FREE"

sbkpay/hostwidget.cpp

@@ -61,6 +61,10 @@ HostWidget::HostWidget(QWidget *parent) :
 
     //ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
     ui->tableWidget->verticalHeader()->setDefaultSectionSize(45);
+
+    for(int r=0; r<10; r++) {
+        ui->tableWidget->insertRow(r);
+    }
 }
 
 void HostWidget::ShowWidget(QWidget *showwidget)
@@ -267,12 +271,35 @@ void HostWidget::ShowWithRequest(AlipayRequest request)
 
 void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
 {
+#ifdef FMTEST
+    flag = true;
+    object[JSON_KEY_STATUSCODE] = 100;
+    object[JSON_KEY_TOTALNUM] = 10;
+    QJsonArray queryInfo;
+    QJsonObject queryObj;
+    if(ui->comBox_payment_method->currentIndex() < 3) {
+        queryObj[JSON_KEY_FMID] = "13131712271000005006";
+        queryObj[JSON_KEY_FMID] = "13131712271000005006";
+    } else {
+        queryObj[JSON_KEY_CODE] = "7310180806223610";
+        queryObj[JSON_KEY_AUTHCODE] = "856875";
+        queryObj[JSON_KEY_SALENO] = "500389";
+    }
+    queryObj[JSON_KEY_TRANSTIME] = "2017-12-26 10:00:00";
+    queryObj[JSON_KEY_TRANSAMOUNT] = 100;
+    queryObj[JSON_KEY_STATE] = 1;
+    queryObj[JSON_KEY_STATEMSG] = QString::fromLocal8Bit("成功");
+    queryInfo.append(queryObj);
+    object[JSON_KEY_QUERYINFO] = queryInfo;
+#endif
     ui->widget_check_load->hide();
     ui->btn_find_check->show();
     _label_find_timer->stop();
 
     _need_exit = true;
 
+    QString currPayStr = ui->comBox_payment_method->currentText();
+
     QLOG_INFO() << object;
 
     if(!flag)
@@ -281,8 +308,6 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
     }
     else
     {
-
-
         if((object.contains(JSON_KEY_TOTALNUM) && object[JSON_KEY_TOTALNUM].toInt() == 0) || !object.contains(JSON_KEY_QUERYINFO))
         {
             ui->label_find_msg->setText(QString::fromLocal8Bit("无交易记录"));
@@ -302,27 +327,48 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
 
             QJsonArray array = object[JSON_KEY_QUERYINFO].toArray();
 
+            int row = 0, col = 0;
             foreach(auto val , array)
             {
                 QJsonObject tmp = val.toObject();
-                ui->tableWidget->insertRow(0);
-                QTableWidgetItem *item0 = new QTableWidgetItem(tmp[JSON_KEY_FMID].toString());
-                item0->setTextAlignment(Qt::AlignCenter);
-                ui->tableWidget->setItem(0, 0, item0);
 
-                QTableWidgetItem *item1 = new QTableWidgetItem(QString::number(tmp[JSON_KEY_TRANSAMOUNT].toInt()/100.0));
-                item1->setTextAlignment(Qt::AlignCenter);
-                ui->tableWidget->setItem(0, 1, item1);
+                QStringList itemDataList;
+                if(_paymentMethodsMapThird.contains(currPayStr)) {
+                    itemDataList << tmp[JSON_KEY_FMID].toString();
+                } else {
+                    itemDataList << tmp[JSON_KEY_CODE].toString()
+                                 << tmp[JSON_KEY_SALENO].toString()
+                                 << tmp[JSON_KEY_AUTHCODE].toString();
+                }
+                itemDataList << QString::number(tmp[JSON_KEY_TRANSAMOUNT].toInt()/100.0)
+                             << tmp[JSON_KEY_TRANSTIME].toString()
+                             << tmp[JSON_KEY_STATEMSG].toString();
+
+
+                ui->tableWidget->insertRow(row);
+                for(col=0; col<itemDataList.length(); col++)
+                {
+                    QTableWidgetItem *item = new QTableWidgetItem(itemDataList.at(col));
+                    item->setTextAlignment(Qt::AlignCenter);
+                    ui->tableWidget->setItem(row, col, item);
+                }
+//                QTableWidgetItem *item0 = new QTableWidgetItem(tmp[JSON_KEY_FMID].toString());
+//                item0->setTextAlignment(Qt::AlignCenter);
+//                ui->tableWidget->setItem(0, 0, item0);
+
+//                QTableWidgetItem *item1 = new QTableWidgetItem(QString::number(tmp[JSON_KEY_TRANSAMOUNT].toInt()/100.0));
+//                item1->setTextAlignment(Qt::AlignCenter);
+//                ui->tableWidget->setItem(0, 1, item1);
 
 
-                QTableWidgetItem *item2 = new QTableWidgetItem(tmp[JSON_KEY_TRANSTIME].toString());
-                item2->setTextAlignment(Qt::AlignCenter);
-                ui->tableWidget->setItem(0, 2, item2);
+//                QTableWidgetItem *item2 = new QTableWidgetItem(tmp[JSON_KEY_TRANSTIME].toString());
+//                item2->setTextAlignment(Qt::AlignCenter);
+//                ui->tableWidget->setItem(0, 2, item2);
 
 
-                QTableWidgetItem *item3 = new QTableWidgetItem(tmp[JSON_KEY_STATEMSG].toString());
-                item3->setTextAlignment(Qt::AlignCenter);
-                ui->tableWidget->setItem(0, 3, item3);
+//                QTableWidgetItem *item3 = new QTableWidgetItem(tmp[JSON_KEY_STATEMSG].toString());
+//                item3->setTextAlignment(Qt::AlignCenter);
+//                ui->tableWidget->setItem(0, 3, item3);
 
                 //NOTE 显示支付渠道
 //                if(_posType == SIMPHONY) {
@@ -331,7 +377,7 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
 //                    ui->tableWidget->setItem(0, 4, item4);
 //                }
 
-                if(_posType != SPCC) {
+                if(_posType != SPCC && (currPayStr==QString::fromLocal8Bit("微信支付") || currPayStr==QString::fromLocal8Bit("支付宝"))) {
                     QWidget *pWdg = new QWidget(ui->tableWidget);
                     QHBoxLayout *hLayout = new QHBoxLayout(pWdg);
                     QPushButton * pBtn = new QPushButton(pWdg);
@@ -343,7 +389,7 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
                     hLayout->addWidget(pBtn);
                     hLayout->setMargin(0);
                     pWdg->setLayout(hLayout);
-                    ui->tableWidget->setCellWidget(0, ui->tableWidget->columnCount()-1, pWdg);   // 操作按钮
+                    ui->tableWidget->setCellWidget(row, ui->tableWidget->columnCount()-1, pWdg);   // 操作按钮
                     pBtn->setStyleSheet("border:0px;border-radius:2px;background-color: rgb(0, 179, 238);font: 75 20px \"Microsoft YaHei UI Light\";");
 
                     qDebug() << "********************-----------*******************" << tmp;
@@ -361,6 +407,8 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
                         on_btn_printagain_clicked();
                         emit RequestWithType(againprint, list);
                     });
+
+                    row ++;
                 }
 
             }

sbkpay/jsonfactory.h

@@ -296,7 +296,7 @@ private:
         QString tmp0 = list[0];
         QString tmp1 = list[1];
         QString tmp2 = list[2];
-        int paymentMethod = list[3].toInt();
+        QString paymentMethod = list[3];
 
         QString cur = QDateTime::currentDateTime().toString("hh:mm:ss");