1. 新增fm_unique_id字段作为会员唯一凭证，修改相关逻辑代码。

FMVip_LXJ/global.h

@@ -96,7 +96,9 @@ struct{
     const QString Birthday          = "birthday";
     const QString Amount            = "amount";
     const QString Mobile            = "mobile";
+    const QString Account           = "account";
     const QString Fm_open_id        = "fm_open_id";
+    const QString Fm_unique_id      = "fm_unique_id";
     const QString CanPay            = "CanPay";
 
     const QString Score             = "score";

FMVip_LXJ/task/tasklogin.cpp

@@ -23,9 +23,10 @@ void TaskLogin::packageServerReq()
 
 void TaskLogin::packagePOSRsp()
 {
-    for (QString prop : {PosProps.StatusCode, PosProps.Msg, PosProps.Fm_open_id}) {
+    for (QString prop : {PosProps.StatusCode, PosProps.Msg}) {
         posRspJsonObj[prop] = getServerJsonValue(prop);
     }
+    posRspJsonObj[PosProps.Fm_open_id] = getServerJsonValue(PosProps.Fm_unique_id);
     posRspJsonObj[PosProps.Prompt] = 0;
 }
 
@@ -49,6 +50,7 @@ void TaskLogin::onLogin()
 //    }
     // 认证成功
     else {
+        QString fm_unique_id = getServerJsonValue(PosProps.Fm_unique_id).toString();
         QString account = getServerJsonValue(PosProps.Fm_open_id).toString();
         QString birthday = getServerJsonValue(PosProps.Birthday).toString();
         QString name = getServerJsonValue(PosProps.Name).toString();
@@ -60,15 +62,10 @@ void TaskLogin::onLogin()
             session()->addData(PosProps.Amount, getServerJsonValue(PosProps.Amount).toInt());
             session()->addData(PosProps.Birthday, birthday);
             session()->addData(PosProps.Mobile, getServerJsonValue(PosProps.Mobile).toString());
-            session()->addData(PosProps.Fm_open_id, account);
+            session()->addData(PosProps.Account, account);              //服务端接口中的account字段(PosProps.Fm_open_id)
+            session()->addData(PosProps.Fm_open_id, fm_unique_id);      //其实是认证接口中返回的fm_unique_id(PosProps.Fm_unique_id)
             session()->addData(PosProps.Score, getServerJsonValue(PosProps.Score).toInt());
-
-            int isActive = getServerJsonValue(PosProps.IsActive).toInt();
-            if(session()->contains(PosProps.IsActive) && isActive==1) {        // 刷卡、服务端已激活则看卡密码是否已修改
-                qDebug() << tr("Server isActive: %1. Card is default password: %2.").arg(isActive).arg(session()->data(PosProps.IsActive).toInt());
-                isActive = session()->data(PosProps.IsActive).toInt();
-            }
-            session()->addData(PosProps.IsActive, isActive);
+            session()->addData(PosProps.IsActive, getServerJsonValue(PosProps.IsActive).toInt());
 
 //            QMap<QString, QVariant> couponMap;
 //            for (auto value : getServerJsonValue(PosProps.CouponList).toArray())

FMVip_LXJ/windows/fmvipfund.cpp

-#include "fmvipfund.h"
+#include "fmvipfund.h"
 //#include "fmvipforward.h"
 #include "ui_fmvipfund.h"
 #include "fmnumpad.h"
@@ -36,7 +36,7 @@ void FMVipFund::initWnd(Session *session)
 
     QString operator_id = session->data(PosProps.OperatorId).toString();
     QString business_date = session->data(PosProps.BussinessDate).toString();
-    QString fm_id = session->data(PosProps.Fm_open_id).toString();
+    QString fm_id = session->data(PosProps.Account).toString();
     QString name = session->data(PosProps.Name).toString();
     QString birthday = session->data(PosProps.Birthday).toString();
 

FMVip_LXJ/windows/fmviporder.cpp

-#include "fmviporder.h"
+#include "fmviporder.h"
 #include "fmmsgwnd.h"
 #include "fmcouponwidget.h"
 #include "ui_fmviporder.h"
@@ -30,7 +30,7 @@ void FMVipOrder::initWnd(Session *session)
 
     QString operator_id = session->data(PosProps.OperatorId).toString();
     QString business_date = session->data(PosProps.BussinessDate).toString();
-    QString fm_id = session->data(PosProps.Fm_open_id).toString();
+    QString fm_id = session->data(PosProps.Account).toString();
     QString name = session->data(PosProps.Name).toString();
     QString birthday = session->data(PosProps.Birthday).toString();
 

FMVip_LXJ/windows/fmvippanel.cpp

-#include "fmvippanel.h"
+#include "fmvippanel.h"
 //#include "fmvipforward.h"
 #include "ui_fmvippanel.h"
 #include "fmvipfund.h"
@@ -24,7 +24,7 @@ void FMVipPanel::initWnd(Session *session)
     this->_session = session;
     ui->operator_label->setText(session->data(PosProps.OperatorId).toString());
     ui->bd_label->setText(session->data(PosProps.BussinessDate).toString());
-    ui->id_label->setText(session->data(PosProps.Fm_open_id).toString());
+    ui->id_label->setText(session->data(PosProps.Account).toString());
     ui->balance_label->setText(DOUBLE_STR(session->data(PosProps.Amount).toInt() / 100.0));
     ui->name_label->setText(session->data(PosProps.Name).toString());
     ui->bir_label->setText(session->data(PosProps.Birthday).toString());