Add 1:融合到升级中

fmTakeaway/DTools/dataManger.cpp

 #include "dataManger.h"
 #include "preDefine.h"
 #include "configManger.h"
+#include <QApplication>
+#include <QTime>
+
 
 // 请求类型
 enum
@@ -27,7 +30,28 @@ QJsonObject DataManger::GetLoginData(const QString &storeId, const QString &pass
 {
     QJsonObject rObj, cObj;
     rObj.insert(JSON_REQTYPE, LOGIN);
-    cObj.insert(JSON_USERNAME, ConfigManger::GetInstance().GetPrefix()+storeId);
+    QString _storeId;
+    if(storeId.startsWith("pos_my_"))
+    {
+        _storeId = storeId;
+    }else
+    {
+        _storeId = ConfigManger::GetInstance().GetPrefix()+storeId;
+    }
+    /// 为了配合升级程序在此处获取到门店号则将其写入配置文件
+
+        /// ../storeInfo.ini -- info/store_id -- info/pos_no
+
+    QString iniPath = QString("%1/../storeInfo.ini").arg(QApplication::applicationDirPath());
+    QSettings setting(iniPath ,QSettings::IniFormat);
+    if(!setting.contains("info/store_id"))
+    {
+        qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+        setting.setValue("info/store_id", _storeId.simplified());
+        setting.setValue("info/pos_no", qrand());
+    }
+
+    cObj.insert(JSON_USERNAME, _storeId);
     cObj.insert(JSON_PASSWORD, password);  
     rObj.insert(JSON_CURRENTUSER, cObj);
     rObj.insert(JSON_STATIONID, stationId);

run/config.ini

 ;非码外卖拉取订单服务器地址
 [FmServer]
-url=http://waimaiapi.freemudorder.com/api
+url=http://wmpos.sandload.cn/api
 ;非码外卖监听端口
 [TcpServer]
 port=34953

run/userConfig.ini

-;打印机信息
 [Printer]
-name=
-;悬浮窗参数
+name=ɳ
+qtname=ǰ̨
+lfname=ɳ
+rcname=ɳ
+
 [Float]
-postion=@Point(100 100)
+postion=@Point(921 204)
 opacity=0.5
 blinkInterval=0.3
 soundInterval=2