Commit 26345010 by guanghui.cui

账单功能

parent 0e7142d5
......@@ -154,12 +154,7 @@ bool FMPDataBase::isRecordExist(QString table, QString condition)
if(!flag)
FMP_WARN() << tmpquery.lastError();
tmpquery.last();
int total=tmpquery.at()+1;
if(total>0)
return true;
return false;
return tmpquery.next();
}
bool FMPDataBase::getSql(QString table, QVariantHash data, QStringList& columnnamelist, QStringList& columnvaluelist)
......
......@@ -21,6 +21,14 @@ typedef struct {
int len;
}FMSOCKEHEADER;
struct PayDetail
{
QString name;
QString num;
QString total;
int status; //状态 支付失败:0 支付成功:1
};
class FMPePayPrivate : public QObject
{
Q_OBJECT
......@@ -60,6 +68,8 @@ public:
bool HttpPost(QJsonObject& outjson, QJsonObject json, QString &error, int timeout = 60);
void GetDailyBillData(QVector<PayDetail> &vecPay);
private:
void ControlReverseJson();
......
......@@ -14,7 +14,7 @@
#include <QMouseEvent>
#include <Windows.h>
#include <QDesktopWidget>
#include <QStandardItemModel>
#include <QPropertyAnimation>
......@@ -93,6 +93,7 @@ FMPPayDialog::FMPPayDialog(FMPePayPrivate *control, QVariantHash basicinfo, QWid
connect(ui->btn_errorOrder, &QPushButton::clicked, this, &FMPPayDialog::onWidgetChange);
connect(ui->btn_success, &QPushButton::clicked, this, &FMPPayDialog::onWidgetChange);
connect(ui->btn_done, &QPushButton::clicked, this, &FMPPayDialog::onWidgetChange);
connect(ui->btn_dailyBill, &QPushButton::clicked, this, &FMPPayDialog::onWidgetChange);
connect(_control, &FMPePayPrivate::error, this, &FMPPayDialog::showErrorMsg);
connect(_control, &FMPePayPrivate::finished, this, &FMPPayDialog::showSuccessMsg);
......@@ -158,6 +159,7 @@ FMPPayDialog::FMPPayDialog(FMPePayPrivate *control, QVariantHash basicinfo, QWid
ui->wdg_query_main->move(0, ui->wdg_query_main->height());
ui->wdg_refund_main->move(0, ui->wdg_refund_main->height());
ui->wdg_success_main->move(0, ui->wdg_success_main->height());
ui->wdg_dailyBill_main->move(0, ui->wdg_dailyBill_main->height());
if (basicinfo["fm_cmd"].toInt() == 10031) {
ui->btn_pay->click();
......@@ -310,6 +312,9 @@ void FMPPayDialog::onWidgetChange()
if(_curt_btn->property("index").toInt() == 6)
setDoneView();
if(_curt_btn->property("index").toInt() == 7)
setDailyBillView();
Movemode move = BtmToTop;
QWidget *nextwdg = findChild<QWidget *>(_curt_btn->property("pageName").toString());
......@@ -509,6 +514,7 @@ void FMPPayDialog::setPayView()
ui->btn_waitPay->setChecked(false);
ui->btn_errorOrder->setChecked(false);
ui->btn_success->setChecked(false);
ui->btn_dailyBill->setChecked(false);
_current_LineEdit = ui->lineedit_num;
}
......@@ -522,6 +528,7 @@ void FMPPayDialog::setRefundView()
ui->btn_waitPay->setChecked(false);
ui->btn_errorOrder->setChecked(false);
ui->btn_success->setChecked(false);
ui->btn_dailyBill->setChecked(false);
ui->lineedit_num_refund->setFocus();
_current_LineEdit = ui->lineedit_num_refund;
}
......@@ -538,6 +545,7 @@ void FMPPayDialog::setCheckView()
ui->btn_waitPay->setChecked(false);
ui->btn_errorOrder->setChecked(false);
ui->btn_success->setChecked(false);
ui->btn_dailyBill->setChecked(false);
ui->lineEdit->clear();
_control->GetMode();
......@@ -554,6 +562,7 @@ void FMPPayDialog::setDoneView()
ui->btn_waitPay->setChecked(false);
ui->btn_errorOrder->setChecked(false);
ui->btn_success->setChecked(false);
ui->btn_dailyBill->setChecked(false);
_control->GetApiReqMode(ORDER_DONE);
}
......@@ -569,6 +578,7 @@ void FMPPayDialog::setSuccessView()
ui->btn_waitPay->setChecked(false);
ui->btn_errorOrder->setChecked(false);
ui->btn_success->setChecked(true);
ui->btn_dailyBill->setChecked(false);
_control->GetApiReqMode(ORDER_PAY_SUCCESS);
}
......@@ -584,6 +594,7 @@ void FMPPayDialog::setErrorOrderView()
ui->btn_waitPay->setChecked(false);
ui->btn_errorOrder->setChecked(true);
ui->btn_success->setChecked(false);
ui->btn_dailyBill->setChecked(false);
_control->GetApiReqMode(ORDER_HAS_ERROR);
}
......@@ -601,10 +612,75 @@ void FMPPayDialog::setWaitPayView()
ui->btn_waitPay->setChecked(true);
ui->btn_errorOrder->setChecked(false);
ui->btn_success->setChecked(false);
ui->btn_dailyBill->setChecked(false);
_control->GetApiReqMode(ORDER_NEED_PAY);
}
void FMPPayDialog::setDailyBillView()
{
ui->label_tip->setVisible(false);
ui->btn_waitPay_close->setEnabled(false);
ui->btn_waitPay_pay->setEnabled(false);
ui->btn_pay->setChecked(false);
ui->btn_refund->setChecked(false);
ui->btn_check->setChecked(false);
ui->btn_done->setChecked(false);
ui->btn_waitPay->setChecked(false);
ui->btn_errorOrder->setChecked(false);
ui->btn_success->setChecked(false);
ui->btn_dailyBill->setChecked(true);
QVector<PayDetail> vecPay;
_control->GetDailyBillData(vecPay);
QStandardItemModel *modelBill = new QStandardItemModel();
modelBill->setColumnCount(3);
modelBill->setHeaderData(0,Qt::Horizontal,QString::fromLocal8Bit("成功收款"));
modelBill->setHeaderData(1,Qt::Horizontal,QString::fromLocal8Bit("笔数"));
modelBill->setHeaderData(2,Qt::Horizontal,QString::fromLocal8Bit("金额(元)"));
ui->tableView_dailyBill->setModel(modelBill);
ui->tableView_dailyBill->setColumnWidth(0, 200);
ui->tableView_dailyBill->setColumnWidth(1, 200);
ui->tableView_dailyBill->setColumnWidth(2, 200);
ui->tableView_dailyBill->setSelectionMode(QTableView::SingleSelection);
ui->tableView_dailyBill->setSelectionBehavior(QTableView::SelectRows);
ui->tableView_dailyBill->setEditTriggers(QTableView::NoEditTriggers);
QStandardItemModel *modelBillFailed = new QStandardItemModel();
modelBillFailed->setColumnCount(3);
modelBillFailed->setHeaderData(0,Qt::Horizontal,QString::fromLocal8Bit("支付失败"));
modelBillFailed->setHeaderData(1,Qt::Horizontal,QString::fromLocal8Bit("笔数"));
modelBillFailed->setHeaderData(2,Qt::Horizontal,QString::fromLocal8Bit("金额(元)"));
ui->tableView_failedBill->setModel(modelBillFailed);
ui->tableView_failedBill->setColumnWidth(0, 200);
ui->tableView_failedBill->setColumnWidth(1, 200);
ui->tableView_failedBill->setColumnWidth(2, 200);
ui->tableView_failedBill->setSelectionMode(QTableView::SingleSelection);
ui->tableView_failedBill->setSelectionBehavior(QTableView::SelectRows);
ui->tableView_failedBill->setEditTriggers(QTableView::NoEditTriggers);
for(int i=0;i<vecPay.size();i++){
if(vecPay[i].status==1){
modelBill->setItem(i,0,new QStandardItem(vecPay[i].name));
modelBill->setItem(i,1,new QStandardItem(vecPay[i].num));
modelBill->setItem(i,2,new QStandardItem(vecPay[i].total));
modelBill->item(i,0)->setTextAlignment(Qt::AlignCenter);
modelBill->item(i,1)->setTextAlignment(Qt::AlignCenter);
modelBill->item(i,2)->setTextAlignment(Qt::AlignCenter);
}
else{
modelBillFailed->setItem(0,0,new QStandardItem(vecPay[i].name));
modelBillFailed->setItem(0,1,new QStandardItem(vecPay[i].num));
modelBillFailed->setItem(0,2,new QStandardItem(vecPay[i].total));
modelBillFailed->item(0,0)->setTextAlignment(Qt::AlignCenter);
modelBillFailed->item(0,1)->setTextAlignment(Qt::AlignCenter);
modelBillFailed->item(0,2)->setTextAlignment(Qt::AlignCenter);
}
}
}
void FMPPayDialog::onBtnNumClicked()
{
......@@ -982,6 +1058,7 @@ void FMPPayDialog::setShowFunc()
ui->btn_errorOrder->setVisible(false);
ui->btn_success->setVisible(false);
ui->btn_done->setVisible(false);
ui->btn_dailyBill->setVisible(false);
ui->wdg_waitPay_main->move(0, ui->wdg_waitPay_main->height());
ui->wdg_pay_main->move(0, 0);
}
......@@ -993,6 +1070,7 @@ void FMPPayDialog::setShowFunc()
ui->btn_errorOrder->setVisible(true);
ui->btn_success->setVisible(true);
ui->btn_done->setVisible(true);
ui->btn_dailyBill->setVisible(true);
ui->wdg_pay_main->move(0, ui->wdg_pay_main->height());
ui->wdg_waitPay_main->move(0, 0);
ui->label_tip->setVisible(false);
......
......@@ -129,6 +129,7 @@ private:
void setErrorOrderView();
void setWaitPayView();
void setDoneView();
void setDailyBillView();
private:
Ui::FMPPayDialog *ui;
......
......@@ -16,5 +16,15 @@
<file>img/dlt02.png</file>
<file>img/dot01.png</file>
<file>img/dot02.png</file>
<file>img/close_order0.png</file>
<file>img/close_order1.png</file>
<file>img/daily_bill0.png</file>
<file>img/daily_bill1.png</file>
<file>img/error_order0.png</file>
<file>img/error_order1.png</file>
<file>img/success_order0.png</file>
<file>img/success_order1.png</file>
<file>img/wait_pay0.png</file>
<file>img/wait_pay1.png</file>
</qresource>
</RCC>
......@@ -5,7 +5,7 @@
#define VER_MINOR 1
#define VER_REVISION 0
#define VER_BUILD 15
#define VER_BUILD 16
//! Convert version numbers to string
#define _STR(S) #S
......
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