Commit a5eae3da by 李定达

1.SaaS点餐小程序支持

parent 8a8cfe1d
...@@ -11,7 +11,8 @@ DEFINES += QUAZIP_STATIC ...@@ -11,7 +11,8 @@ DEFINES += QUAZIP_STATIC
#DEFINES += SHIQIJIA #DEFINES += SHIQIJIA
#DEFINES += SHAN_LIN #DEFINES += SHAN_LIN
#DEFINES += BALIBEITIAN #DEFINES += BALIBEITIAN
DEFINES += AXMX #DEFINES += AXMX
DEFINES += SAAS
#DEFINES += AI_SEN #DEFINES += AI_SEN
#DEFINES += TODAY #DEFINES += TODAY
......
...@@ -110,6 +110,11 @@ FmTools::FmTools() ...@@ -110,6 +110,11 @@ FmTools::FmTools()
qDebug() << "-----------------------------" << storeid; qDebug() << "-----------------------------" << storeid;
#endif #endif
#ifdef SAAS
m_partnerId = "66666";
#endif
#ifdef BALIBEITIAN #ifdef BALIBEITIAN
#define MY_CFG "FMPOS.ini" #define MY_CFG "FMPOS.ini"
...@@ -301,6 +306,18 @@ QByteArray FmTools::GetUpdateData() ...@@ -301,6 +306,18 @@ QByteArray FmTools::GetUpdateData()
#elif AXMX #elif AXMX
rObj.insert(JSON_STOREID, m_keyStoreId); rObj.insert(JSON_STOREID, m_keyStoreId);
rObj.insert(JSON_POSNO, m_keyPosId); rObj.insert(JSON_POSNO, m_keyPosId);
#elif SAAS
QString configfile = qApp->applicationDirPath() + "/takeaway/config.ini";
QString storeid = QSettings(configfile, QSettings::IniFormat).value("base/storeid").toString();
QString posId = QSettings(configfile, QSettings::IniFormat).value("base/stationid").toString();
QString parnetid = QSettings(configfile, QSettings::IniFormat).value("base/parnetid").toString();
QString relposid = parnetid + storeid + posId;
rObj.insert(JSON_STOREID, storeid);
rObj.insert(JSON_POSNO, relposid);
#else #else
rObj.insert(JSON_STOREID, setting.value(m_keyStoreId).toString()); rObj.insert(JSON_STOREID, setting.value(m_keyStoreId).toString());
rObj.insert(JSON_POSNO, setting.value(m_keyPosId).toString()); rObj.insert(JSON_POSNO, setting.value(m_keyPosId).toString());
...@@ -338,6 +355,17 @@ QByteArray FmTools::GetReportData(QString planid, QString msg, QString updateSta ...@@ -338,6 +355,17 @@ QByteArray FmTools::GetReportData(QString planid, QString msg, QString updateSta
#elif AXMX #elif AXMX
rObj.insert(JSON_STOREID, m_keyStoreId); rObj.insert(JSON_STOREID, m_keyStoreId);
rObj.insert(JSON_POSNO, m_keyPosId); rObj.insert(JSON_POSNO, m_keyPosId);
#elif SAAS
QString configfile = qApp->applicationDirPath() + "/takeaway/config.ini";
QString storeid = QSettings(configfile, QSettings::IniFormat).value("base/storeid").toString();
QString posId = QSettings(configfile, QSettings::IniFormat).value("base/stationid").toString();
QString parnetid = QSettings(configfile, QSettings::IniFormat).value("base/parnetid").toString();
QString relposid = parnetid + storeid + posId;
rObj.insert(JSON_STOREID, storeid);
rObj.insert(JSON_POSNO, relposid);
#else #else
rObj.insert(JSON_STOREID, setting.value(m_keyStoreId).toString()); rObj.insert(JSON_STOREID, setting.value(m_keyStoreId).toString());
rObj.insert(JSON_POSNO, setting.value(m_keyPosId).toString()); rObj.insert(JSON_POSNO, setting.value(m_keyPosId).toString());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment