1. 修复修改查询的支付方式或日期后，分页未重置问题。

sbkpay/hostwidget.cpp

@@ -13,7 +13,8 @@
 HostWidget::HostWidget(QWidget *parent) :
     FMPWindow(parent),
     ui(new Ui::HostWidget),
-    _currPayStr("")
+    _queryPaymentMethod(""),
+    _queryConditionsIsChanged(true)
 {
     ui->setupUi(this);
 
@@ -283,10 +284,10 @@ void HostWidget::ShowWithRequest(AlipayRequest request)
 
 void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
 {
-#ifdef FMTEST_DATA
+#ifdef FMTEST
     flag = true;
     object[JSON_KEY_STATUSCODE] = 100;
-    object[JSON_KEY_TOTALNUM] = 10;
+    object[JSON_KEY_TOTALNUM] = 22;
     object[JSON_KEY_TOTALAMOUNT] = 998;
     QJsonArray queryInfo;
     QJsonObject queryObj;
@@ -336,7 +337,7 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
         else
         {
             ui->frame->show();
-            ui->label_find_msg->setText(QString::fromLocal8Bit("%1的账单流水").arg(ui->dateEdit_find_begin->text()));
+            ui->label_find_msg->setText(QString::fromLocal8Bit("%1的账单流水").arg(_queryPaymentDate.toString("yyyy-MM-dd")));
             ui->label_total_amount->setText(QString::fromLocal8Bit("总金额：%1").arg(object[JSON_KEY_TOTALAMOUNT].toInt(0) / 100.0));
 
             if(ui->label_find_page->text().compare("1") == 0)
@@ -355,7 +356,7 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
                 QJsonObject tmp = val.toObject();
 
                 QStringList itemDataList;
-                if(_paymentMethodsMapThird.contains(_currPayStr)) {
+                if(_paymentMethodsMapThird.contains(_queryPaymentMethod)) {
                     itemDataList << tmp[JSON_KEY_FMID].toString();
                 } else {
                     itemDataList << tmp[JSON_KEY_CODE].toString()
@@ -402,7 +403,7 @@ void HostWidget::ShowWiteJson(bool flag, QJsonObject object, QString error)
 //                    ui->tableWidget->setItem(0, 4, item4);
 //                }
 
-                if(_posType != SPCC && (_currPayStr==QString::fromLocal8Bit("微信支付") || _currPayStr==QString::fromLocal8Bit("支付宝支付"))) {
+                if(_posType != SPCC && (_queryPaymentMethod==QString::fromLocal8Bit("微信支付") || _queryPaymentMethod==QString::fromLocal8Bit("支付宝支付"))) {
                     QWidget *pWdg = new QWidget(ui->tableWidget);
                     QHBoxLayout *hLayout = new QHBoxLayout(pWdg);
                     QPushButton * pBtn = new QPushButton(pWdg);
@@ -809,29 +810,35 @@ void HostWidget::on_btn_mananger_print_shift_clicked()
 
 void HostWidget::on_btn_find_check_clicked()
 {
-
     QStringList list;
 
+    if(_queryConditionsIsChanged) {
+        _queryPaymentMethod = ui->comBox_payment_method->currentText();
+        _queryPaymentDate = ui->dateEdit_find_begin->date();
+        ui->label_find_page->setText("1");
+        _queryConditionsIsChanged = false;
+    }
+
     ui->tableWidget->clear();
+
     SetTableWidgetHeader();
 
     ui->frame->hide();
     ui->label_total_amount->setText("");
     ui->widget_check_load->show();
     ui->btn_find_check->hide();
-    list.append(ui->dateEdit_find_begin->dateTime().toString("yyyy-MM-dd hh:mm:ss"));
-    list.append(ui->dateEdit_find_begin->dateTime().addDays(1).toString("yyyy-MM-dd hh:mm:ss"));
+    list.append(_queryPaymentDate.toString("yyyy-MM-dd 00:00:00"));
+    list.append(_queryPaymentDate.addDays(1).toString("yyyy-MM-dd 00:00:00"));
 
 //    list.append(ui->dateEdit_find_begin->text().replace("/","-"));
     list.append(ui->label_find_page->text());
 
     // 支付方式code
-    QString currPaymentMethod = ui->comBox_payment_method->currentText();
     QString payCode;
-    if(_paymentMethodsMapThird.contains(currPaymentMethod)) {
-        payCode = _paymentMethodsMapThird[currPaymentMethod];
+    if(_paymentMethodsMapThird.contains(_queryPaymentMethod)) {
+        payCode = _paymentMethodsMapThird[_queryPaymentMethod];
     } else {
-        payCode = _paymentMethodsMapCoupon[currPaymentMethod];
+        payCode = _paymentMethodsMapCoupon[_queryPaymentMethod];
     }
     list.append(payCode);
 
@@ -913,12 +920,10 @@ void HostWidget::SetTableWidgetHeader()
     QStringList headerString;
     QList<double> widthScale;
 
-    _currPayStr = ui->comBox_payment_method->currentText();
-
-    if(_paymentMethodsMapThird.contains(_currPayStr)) {
+    if(_paymentMethodsMapThird.contains(_queryPaymentMethod)) {
         headerString<<QString::fromLocal8Bit("订单编号")<<QString::fromLocal8Bit("订单金额")<<QString::fromLocal8Bit("订单时间")<<QString::fromLocal8Bit("支付状态");
         // 只有微信支付和支付宝支付有操作列，且商户不是SPCC
-        if(_posType != SPCC && (_currPayStr==QString::fromLocal8Bit("支付宝支付")||_currPayStr==QString::fromLocal8Bit("微信支付"))) {
+        if(_posType != SPCC && (_queryPaymentMethod==QString::fromLocal8Bit("支付宝支付")||_queryPaymentMethod==QString::fromLocal8Bit("微信支付"))) {
             headerString << QString::fromLocal8Bit("操作");
         }
     } else {
@@ -952,3 +957,13 @@ void HostWidget::SetTableWidgetHeader()
 
     ui->tableWidget->setHorizontalHeaderLabels(headerString);
 }
+
+void HostWidget::on_dateEdit_find_begin_dateChanged()
+{
+    _queryConditionsIsChanged = true;
+}
+
+void HostWidget::on_comBox_payment_method_currentTextChanged()
+{
+    _queryConditionsIsChanged = true;
+}

sbkpay/hostwidget.h

@@ -9,6 +9,7 @@
 #include <QTimer>
 #include <QStringList>
 #include <fmglobal.h>
+#include <QDate>
 
 class LabelsTimer;
 class QMovie;
@@ -91,6 +92,10 @@ private slots:
 
     void onPaymentMethodBtnsToggled(QAbstractButton *, bool);
 
+    void on_dateEdit_find_begin_dateChanged();
+
+    void on_comBox_payment_method_currentTextChanged();
+
 private:
     void ShowWidget(QWidget *showwidget);
 
@@ -132,7 +137,9 @@ private:
     ReqType _type;
 
     QMap<QString, QString> _paymentMethodsMapThird, _paymentMethodsMapCoupon;
-    QString _currPayStr;
+    QString _queryPaymentMethod;
+    QDate _queryPaymentDate;
+    bool _queryConditionsIsChanged;
 };
 
 #endif // HOSTWIDGET_H