1.支付流程优化

fmp_epay.cpp

@@ -88,3 +88,8 @@ QByteArray FMPePay::DockQueryRespond()
 {
     return d_func()->DockQueryRespond();
 }
+
+void FMPePay::DockPayCode(const QString &code)
+{
+    d_func()->DockPayCode(code);
+}

fmp_epay.h

@@ -30,12 +30,18 @@ public:
 
     void                DockQueryRequest(const QByteArray &json);
     QByteArray          DockQueryRespond();
+     void               DockPayCode(const QString &code);
+
+
 
 
 protected slots:
     void                InitService();
     void                UninitService();
 
+public:
+    QString test;
+
 
 private:
     bool                _inited;

fmp_epay.pro

@@ -25,6 +25,7 @@ SOURCES += \
     fmp_pe_handlers.cpp \
     fmnumpad.cpp
 
+
 HEADERS +=\
     fmp_epay.h \
     fmp_epay_i.h \
@@ -39,6 +40,7 @@ HEADERS +=\
     fmp_pe_handlers.h \
     fmnumpad.h
 
+
 unix {
     target.path = /usr/lib
     INSTALLS += target

fmp_epay_i.h

@@ -30,11 +30,17 @@ public:
 
     virtual void        DockQueryRequest(const QByteArray &json) = 0;
     virtual QByteArray  DockQueryRespond() = 0;
+    virtual void        DockPayCode(const QString &code) = 0;
+
+
     
 signals:
     void                TriggerInit();
     void                TriggerUninit();
 
+public:
+   QString _payQcode;
+
 protected slots:
     void                OnTriggerInit() { FMPluginInterface::OnTriggerInit(); }
     void                OnTriggerUninit() { FMPluginInterface::OnTriggerUninit(); }

fmp_epay_p.cpp

@@ -198,11 +198,12 @@ void FMPePayPrivate::Init()
 
     if(_payDialog == nullptr) {
         _payDialog = new FMPPayDialog(this, hash);
+
     }
     else {
         _payDialog->setBasicInfo(hash);
     }
-
+     _payDialog->setPayCode();  //zxj
     _payDialog->show();
 
     if(_origin_request["fm_cmd"].toInt() == 10041 && !hash[FMP_JKEY_FM_ORDERID].toString().isEmpty()) {
@@ -292,6 +293,7 @@ QByteArray FMPePayPrivate::DockPayRespond()
     return json;
 }
 
+
 void FMPePayPrivate::DockRefundRequest(const QByteArray &json)
 {
     _is_api = true;
@@ -333,6 +335,11 @@ QByteArray FMPePayPrivate::DockQueryRespond()
     return "";
 }
 
+void FMPePayPrivate::DockPayCode(const QString &code)
+{
+    _payCode = code;
+}
+
 
 void FMPePayPrivate::OnFinish()
 {

fmp_epay_p.h

@@ -46,6 +46,8 @@ public:
     void                DockQueryRequest(const QByteArray &json);
     QByteArray          DockQueryRespond();
 
+    void        DockPayCode(const QString &code);
+
 
 private:
     void                ControlReverseJson();
@@ -94,6 +96,8 @@ private:
     bool                _is_api;
     bool                _api_abort;
     bool                _reverse_flag;
+public:
+    QString             _payCode;
 
     static unsigned int s_ClientReqCount;
 

fmp_epayview_dialog.cpp

@@ -75,6 +75,7 @@ FMPPayDialog::FMPPayDialog(FMPePayPrivate *control, QVariantHash basicinfo, QWid
     connect(ui->btn_confirm01, &QPushButton::clicked, this, &FMPPayDialog::onBtnConfirmClicked);
     connect(ui->btn_confirm01_refund, &QPushButton::clicked, this, &FMPPayDialog::onBtnConfirmClicked);
     connect(ui->lineedit_code, &FMPFocusLineEdit::returnPressed, this, &FMPPayDialog::onBtnConfirmClicked);
+    connect(ui->lineedit_num, &FMPFocusLineEdit::returnPressed, this, &FMPPayDialog::onBtnConfirmClicked);
 
 
 
@@ -193,6 +194,27 @@ void FMPPayDialog::confirmRefund()
     onBtnConfirmClicked();
 }
 
+void FMPPayDialog::setPayCode()//设置付款码
+{
+    QString temp = _control->_payCode;
+    qDebug()<<"************payCode is"<<temp;
+    if(!temp.isEmpty())
+    {
+        ui->lineedit_code->setText(temp);
+        ui->lineedit_code->setDisabled(true);
+         qDebug()<<"************payCode clear";
+
+    }
+    else
+    {
+         qDebug()<<"^^^^^^****payCode clear and enable ";
+         ui->lineedit_code->setDisabled(false);
+
+    }
+
+
+}
+
 void FMPPayDialog::show()
 {
 
@@ -650,6 +672,7 @@ void FMPPayDialog::onBtnConfirmClicked()
     {
         _wait->SetContent(FMPPayWait::LOADING, QString::fromLocal8Bit("支付中..."));
         _control->ControlPayJson(ui->lineedit_num->text(), ui->lineedit_code->text());
+        ui->lineedit_num->clear();
 
     }
     else

fmp_epayview_dialog.h

@@ -43,6 +43,7 @@ public:
     int getPayAmount() const;
 
     void confirmRefund();
+    void  setPayCode();//zxj  设置付款码
 
 public slots:
     void showErrorMsg(QString errormsg);