将sessionDataMap的值类型修改为QVariant，修改各处取得sessionData值的代码。

FMVip/fmvipdispatcher.cpp

@@ -312,6 +312,6 @@ void FMVipDispatcher::orderRevoke()
 
 BOOL FMVipDispatcher::isLogined()
 {
-    QString account = FMVipForward::instance()->sessionData("fm_open_id");
+    QString account = SESSION_STRING("fm_open_id");
     return account != "";
 }

FMVip/fmvipforward.cpp

@@ -164,14 +164,14 @@ void FMVipForward::login(const QJsonObject &job, QJsonObject &fmjob)
 {
     Q_UNUSED(job);
     fmjob["reqType"] = FM_VIP_LOGIN;
-    fmjob["code"] = sessionData("code");
+    fmjob["code"] = SESSION_STRING("code");
 }
 void FMVipForward::fund(const QJsonObject &job, QJsonObject &fmjob)
 {
     fmjob["reqType"] = FM_VIP_FUND;
 
     QJsonObject transObj;
-    transObj["account"] = sessionData("fm_open_id");
+    transObj["account"] = SESSION_STRING("fm_open_id");
     transObj["amount"] = job["charge_amount"];
     transObj["cashAmount"] = job["charge_amount"];
     transObj["thirdAmount"] = 0;
@@ -190,10 +190,10 @@ void FMVipForward::pay(const QJsonObject &job, QJsonObject &fmjob)
     Q_UNUSED(job);
     fmjob["reqType"] = FM_VIP_PAY;
 
-    _sessionForward = job["forward"].toObject();
+    addSessionData("forward", job["forward"].toObject());
 
     QJsonObject transObj;
-    transObj["account"] = sessionData("fm_open_id");
+    transObj["account"] = SESSION_STRING("fm_open_id");
     transObj["codeAmount"] = sessionDataInt("codeAmount");
     transObj["isUseScore"] = sessionDataInt("isUseScore");
 
@@ -435,17 +435,16 @@ void FMVipForward::clearSessionData()
 {
     _sessionCouponMap.clear();
     _sessionDataMap.clear();
-    _sessionForward = QJsonObject();
 }
 
-void FMVipForward::addSessionData(const QString key, const QString value)
+void FMVipForward::addSessionData(const QString key, const QVariant value)
 {
     _sessionDataMap.insert(key, value);
 }
 
-QString FMVipForward::sessionData(const QString key) const
+QVariant FMVipForward::sessionData(const QString key) const
 {
-    QString value = "";
+    QVariant value;
     if (_sessionDataMap.contains(key)) {
         value = _sessionDataMap[key];
     }
@@ -454,7 +453,7 @@ QString FMVipForward::sessionData(const QString key) const
 
 int FMVipForward::sessionDataInt(const QString key) const
 {
-    QString value = sessionData(key);
+    QVariant value = sessionData(key);
     return value.toInt();
 }
 

FMVip/fmvipforward.h

@@ -29,6 +29,11 @@
 #define FM_VIP_COUPON   1006
 #define FM_VIP_FINAL    1007
 
+#define SESSION_DATA(key)           FMVipForward::instance()->sessionData(key)
+#define SESSION_STRING(key)         SESSION_DATA(key).toString()
+#define SESSION_INT(key)            SESSION_DATA(key).toInt();
+#define SESSION_JSONOBJECT(key)     SESSION_DATA(key).toJsonObject()
+
 struct Coupon
 {
     QString code;
@@ -47,8 +52,8 @@ public:
     void parseRequest(const QJsonObject &jsonObj);
 
     void resetSessionData(const QJsonObject &jsonObj);
-    void addSessionData(const QString key, const QString value);
-    QString sessionData(const QString key) const;
+    void addSessionData(const QString key, const QVariant value);
+    QVariant sessionData(const QString key) const;
     int     sessionDataInt(const QString key) const;
     void clearSessionData();
     QMap<QString, Coupon>  sessionCouponMap() const;
@@ -93,7 +98,7 @@ private:
     QString                 _urlStr;
     int                     _reqType;
 
-    QMap<QString, QString>  _sessionDataMap;
+    QMap<QString, QVariant>  _sessionDataMap;
     QStringList             _sessionDataList;
     QJsonObject             _sessionForward;
     QMap<QString, Coupon>  _sessionCouponMap;

FMVip/fmvipfund.cpp

@@ -8,12 +8,12 @@ FMVipFund::FMVipFund(QDialog *parent) :
     ui(new Ui::FMVipFund)
 {
     ui->setupUi(this);
-    QString operator_id = FMVipForward::instance()->sessionData("operator_id");
-    QString business_date = FMVipForward::instance()->sessionData("business_date");
-    QString fm_id = FMVipForward::instance()->sessionData("fm_open_id");
-    QString amount_str = FMVipForward::instance()->sessionData("amount");
-    QString charge_amount_str = FMVipForward::instance()->sessionData("charge_amount");
-    QString name = FMVipForward::instance()->sessionData("name");
+    QString operator_id = SESSION_STRING("operator_id");
+    QString business_date = SESSION_STRING("business_date");
+    QString fm_id = SESSION_STRING("fm_open_id");
+    QString amount_str = SESSION_STRING("amount");
+    QString charge_amount_str = SESSION_STRING("charge_amount");
+    QString name = SESSION_STRING("name");
 
     double amount = amount_str.toDouble() / 100.0;
     double charge_amount = charge_amount_str.toDouble() / 100.0;

FMVip/fmviplogin.cpp

@@ -15,8 +15,8 @@ FMVipLogin::FMVipLogin(bool isMustPayCode, QDialog *parent) :
 {
     ui->setupUi(this);
 
-    QString operator_id = FMVipForward::instance()->sessionData("operator_id");
-    QString business_date = FMVipForward::instance()->sessionData("business_date");
+    QString operator_id = SESSION_STRING("operator_id");
+    QString business_date = SESSION_STRING("business_date");
 
 
     ui->login_edit->setFocus();

FMVip/fmviporder.cpp

@@ -11,13 +11,13 @@ FMVipOrder::FMVipOrder(QDialog *parent) :
 {
     ui->setupUi(this);
 
-    QString operator_id = FMVipForward::instance()->sessionData("operator_id");
-    QString business_date = FMVipForward::instance()->sessionData("business_date");
-    QString fm_id = FMVipForward::instance()->sessionData("fm_open_id");
-    QString amount_str = FMVipForward::instance()->sessionData("amount");
-    QString score_str = FMVipForward::instance()->sessionData("score");
-    QString needPay_str = FMVipForward::instance()->sessionData("needPay");
-    QString name = FMVipForward::instance()->sessionData("name");
+    QString operator_id = SESSION_STRING("operator_id");
+    QString business_date = SESSION_STRING("business_date");
+    QString fm_id = SESSION_STRING("fm_open_id");
+    QString amount_str = SESSION_STRING("amount");
+    QString score_str = SESSION_STRING("score");
+    QString needPay_str = SESSION_STRING("needPay");
+    QString name = SESSION_STRING("name");
     double standard_amount = FMVipForward::instance()->sessionDataInt("standard_amount") / 100.0;
 
     orderInfo = new FMVipOrder::OrderInfo(amount_str, score_str, needPay_str);