Merge branch 'lvlanzi' of http://gitlab.freemud.com/zhenfei.zhang/fmp_epay into lvlanzi

# Conflicts:
#	fmp_epay.cpp
#	version.h

fmp_epay.cpp

@@ -39,6 +39,8 @@ FMPePay::~FMPePay()
 void FMPePay::InitService()
 {
 
+    if (_inited) return;
+
 
     Q_D(FMPePay);
     d->Init();

fmp_epay_p.cpp

@@ -416,6 +416,8 @@ void FMPePayPrivate::OnFinish()
 
     emit confirmClicked();
     _api_evt.quit();
+    delete _payDialog;
+    _payDialog = nullptr;
 }
 
 void FMPePayPrivate::ControlPayJson(QString sum, QString code)
@@ -880,13 +882,15 @@ bool FMPePayPrivate::GetPayJson(const QString& sum, const QString& code)
         _docked_request[FMP_EPAY_STATIONID] = _origin_request["pos_id"];
         _docked_request[FMP_EPAY_OPERATORID] = _origin_request[FMP_EPAY_OPERATORID];
         _docked_request[FMP_EPAY_BUSINESSDATE] = _origin_request[FMP_EPAY_BUSINESSDATE];
+        _docked_request[FMP_EPAY_TRANSID] = _origin_request[FMP_EPAY_TRANSID].toString();
     }
     else {
         transaction.insert(FMP_EPAY_TRANSTRACTION_AMOUNT, (int)((sum.toDouble() + 0.005) * 100));
-        _docked_request.insert( FMP_EPAY_BUSINESSDATE, q->_businessdate);
-        _docked_request.insert( FMP_EPAY_STOREID, q->_store_id);
-        _docked_request.insert( FMP_EPAY_STATIONID, q->_station_id);
-        _docked_request.insert( FMP_EPAY_OPERATORID, q->_operator_id);
+        _docked_request[FMP_EPAY_BUSINESSDATE] = q->_businessdate;
+        _docked_request[FMP_EPAY_STOREID] = q->_store_id;
+        _docked_request[FMP_EPAY_STATIONID] = q->_station_id;
+        _docked_request[FMP_EPAY_OPERATORID] = q->_operator_id;
+        _docked_request[FMP_EPAY_TRANSID] = QDateTime::currentDateTime().toString("yyyyMMddhhmmsszzz");
     }
 
     transactionarry.append( transaction);
@@ -896,8 +900,6 @@ bool FMPePayPrivate::GetPayJson(const QString& sum, const QString& code)
     _docked_request.insert( FMP_EPAY_PARTNERID, q->_partner_id.toInt());
     _docked_request.insert( FMP_EPAY_CLIENTREQCOUNT, (int)((++s_ClientReqCount)%=10000000));
 
-//    _docked_request.insert( FMP_EPAY_TRANSID, QDateTime::currentDateTime().toString("yyyyMMddhhmmsszzz"));
-    _docked_request.insert(FMP_EPAY_TRANSID, _origin_request[FMP_EPAY_TRANSID].toString());
     _docked_request.insert( FMP_EPAY_TRANSTRACTION, transactionarry);
 
     return true;
@@ -925,12 +927,12 @@ bool FMPePayPrivate::GetRefundJson(const QJsonObject &trans)
         if (_is_api) {
             QJsonObject orig_trans = _origin_request["transactions"].toObject();
             transaction.insert(FMP_EPAY_REFUND_TRANSTRACTION_AMOUNT, (int)(orig_trans["refund_amount"].toDouble() + 0.005));
+            _docked_request.insert(FMP_EPAY_TRANSID, _origin_request[FMP_EPAY_TRANSID].toString());
         }
         else {
             transaction.insert(FMP_EPAY_REFUND_TRANSTRACTION_AMOUNT, (int)(trans[FMP_JKEY_REFUND_AMOUNT].toDouble() + 0.005));
+            _docked_request.insert(FMP_EPAY_TRANSID, QDateTime::currentDateTime().toString("yyyyMMddhhmmsszzz"));
         }
-//        _docked_request.insert(FMP_EPAY_TRANSID, QDateTime::currentDateTime().toString("yyyyMMddhhmmsszzz"));
-        _docked_request.insert(FMP_EPAY_TRANSID, _origin_request[FMP_EPAY_TRANSID].toString());
     }
     else {
         transaction.insert(FMP_EPAY_REFUND_TRANSTRACTION_EBCODE,  trans[FMP_JKEY_PAY_EBCODE]);

fmp_epayview_dialog.cpp

@@ -442,6 +442,7 @@ void FMPPayDialog::setRefundSuccessView(QJsonObject json)
 void FMPPayDialog::setPayView()
 {
     ui->label_tip->setVisible(true);
+    ui->verticalLayout->insertWidget(1, ui->label_tip);
     ui->lineedit_num->setFocus();
     ui->btn_pay->setChecked(true);
     ui->btn_refund->setChecked(false);

version.h

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