Merge branch 'feature' into dev

FMVip/fmvipdispatcher.cpp

@@ -146,9 +146,9 @@ void FMVipDispatcher::onRequest(const QJsonObject &jsonObj)
     }
     else if(type == Type_Pay || type == Type_Fund) {
         requestSuccess = true;
-        // 支付、充值先检查登陆状态。
+        // 支付、充值先登陆。
         QJsonObject copyJsonObj(jsonObj);
-        if(type == Type_Fund && !isLogined())
+        if(type == Type_Fund)
         {
             _posReqObj["fm_cmd"] = Type_Login;
             isLastOne = false;

FMVip/fmvipforward.cpp

@@ -480,6 +480,10 @@ QString FMVipForward::sign(const QJsonObject &reqJob) const
     mapData["partnerId"] = reqJob.value("partnerId").toString();
     mapData["t"] = reqJob.value("t").toString();
 
+    if (reqJob["reqType"].toInt() == FM_VIP_FUND) {
+        mapData["transId"] = reqJob.value("transId").toString();
+    }
+
     // 使用URL键值对的格式拼接
     QString sb = "";
     foreach(QString key , mapData.keys())