1.修改第三方支付。 2.使用FMLOG打印日志。

FMVip/fmvipforward.cpp

@@ -22,7 +22,6 @@ FMVipForward::FMVipForward(QObject *parent) : QObject(parent)
 {
     _urlStr = _cfg.GetTransUrlFormat();
     _sessionDataList = QString("operator_id,pos_id,business_date").split(",");
-    _thirdTypeList = QString("支付宝,微信,银联,其他").split(",");
     connect(&_nam, SIGNAL(finished(QNetworkReply*)), this, SLOT(onServerFinished(QNetworkReply*)));
 }
 
@@ -231,15 +230,15 @@ void FMVipForward::final(const QJsonObject &job, QJsonObject &fmjob)
             scoreAmount = pay_ob["paid_total_amount"].toInt();
         } else if(type == "77") {
             coupons.append(pay_ob["code"].toString());
-        } else if(type == "26") {
-            thirdAmount = pay_ob["padi_total_amount"].toInt();
-            transObj["thirdPayTransId"] = pay_ob["paid_transid"];
-            QString thirdPayType = pay_ob["pay_str"].toString().trimmed();
-            int t = _thirdTypeList.indexOf(thirdPayType);
-            if (t < 0) {
-                type = _thirdTypeList.length();
+        } else if(type == "72" || type == "73") {
+            thirdAmount = pay_ob["paid_total_amount"].toInt();
+            transObj["thirdPayTransId"] = pay_ob["pay_transId"];
+
+            if (type == "72") {                 // 支付宝
+                transObj["thirdPayType"] = 1;
+            } else if(type == "73") {           // 微信
+                transObj["thirdPayType"] = 2;
             }
-            transObj["thirdPayType"] = t;
         }
     }
     transObj["coupons"] = coupons;
@@ -251,8 +250,6 @@ void FMVipForward::final(const QJsonObject &job, QJsonObject &fmjob)
     transObj["scoreAmount"] = scoreAmount;
     transObj["cashAmount"] = cashAmount;
     transObj["thirdAmount"] = thirdAmount;
-    transObj["thirdPayType"] = 0;
-    transObj["thirdPayTransId"] = "";
 
     QJsonArray posProdArray = posTransObj["products"].toArray();
     QJsonArray prodArray;

FMVip/fmvipforward.h

@@ -104,7 +104,6 @@ private:
 
     QMap<QString, QVariant>  _sessionDataMap;
     QStringList             _sessionDataList;
-    QStringList             _thirdTypeList;
 signals:
     void                serverResponsed(const QJsonObject& rspData);
 private slots:

FMVip/fmviporder.cpp

@@ -39,6 +39,8 @@ FMVipOrder::FMVipOrder(QDialog *parent) :
 
     if(standard_amount > 0) {
         ui->standard_label->setText(QString("满 %1 元可享受储值金满额优惠").arg(standard_amount));
+    } else {
+        ui->standard_label->setText("");
     }
     ui->pay_edit->setText(orderInfo->getNeedPayStr());
     ui->pay_edit->setFocus();

FMVip/main.cpp

 #include "fmsockserver.h"
 #include "fmvipdispatcher.h"
+#include "include/fmutils/fmutils.hpp"
 #include <QApplication>
-#include <QFile>
-#include <QTextStream>
-#include <QDateTime>
 
 bool checkOnly()
 {
@@ -45,30 +43,22 @@ bool checkOnly()
 void customMessageHandler(QtMsgType type,const QMessageLogContext& Context, const QString &msg)
 {
     Q_UNUSED(Context);
-    QString txt;
+    QString debugInfo;
     switch (type) {
     case QtDebugMsg:
-        txt = QString("Debug: %1").arg(msg);
+        debugInfo = QString("Debug: %1").arg(msg);
         break;
     case QtWarningMsg:
-        txt = QString("Warning: %1").arg(msg);
+        debugInfo = QString("Warning: %1").arg(msg);
         break;
     case QtCriticalMsg:
-        txt = QString("Critical: %1").arg(msg);
+        debugInfo = QString("Critical: %1").arg(msg);
         break;
     case QtFatalMsg:
-        txt = QString("Fatal: %1").arg(msg);
+        debugInfo = QString("Fatal: %1").arg(msg);
         abort();
     }
-
-    QString strDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss ddd");
-
-    QFile outFile(qApp->applicationDirPath() + "debuglog.txt");
-    outFile.open(QIODevice::WriteOnly | QIODevice::Append);
-    QTextStream ts(&outFile);
-    ts << strDateTime << txt << "\r\n";
-    outFile.flush();
-    outFile.close();
+    FMLOG("%s",debugInfo.toStdString().c_str());
 }
 
 int main(int argc, char *argv[])