1、当店员正在为线下客户服务时，触发异常请求：actionId=6,gloSimErrCode=20；用来解锁外卖插件的悬浮框；

2、门店店员切换账号后，及时更新显示到插件上的收银员；
3、修复外卖插件，有订单待录入POS时，会一直闪烁提醒；

fmTakeout/Control/flowControl.h

@@ -84,6 +84,7 @@ private:
     QTimer *m_pullTimer;
     QTimer *m_loginTimer;
     QTimer *m_notifySimPullTimer;
+    QTimer *m_remindCasherBlinkFloatTimer;  //插件程序收到外卖订单后，需要一致提醒店员[直到此外卖订单被全部录入到POS系统]
     // 网络通信
     BillSocket *m_loginSocket;
     BillSocket *m_pullOrderSocket;
@@ -96,6 +97,8 @@ private:
     bool m_bFirstRecvInfo;
     bool m_bLoginResult;
     bool m_bOperateResult;
+    // 标记目前悬浮框是否 锁住状态[false:悬浮框解锁状态; true:悬浮框锁住状态]；
+    bool m_bFloatFromLockSt;
     // HttpServer
     //JQHttpServer::TcpServerManage* m_tcpServerManage;
     LoaclHttpServer* loaclHttpServer;
@@ -315,6 +318,7 @@ private slots:
     void _ClickOMSAssignArea();
     void _ClickToLogin();
     void _ClickToNotifySimPullOrder();
+    void _RemindCasherBlinkFloatForm();
     void _OrderAnalysis(const QJsonObject &jsonObject);
 
 
@@ -442,11 +446,11 @@ public slots:
     bool _ResponseOMS11Request(const QJsonObject &content, QJsonObject &data,QString &error);
 
     /**
-    *功能:FM外卖插件为响应Simphony请求[action:12 -> Sim/POS推送门店营业状态]准备返回数据
+    *功能:FM外卖插件为响应OMS推送门店状态 请求[action:12 -> OMS->POS推送门店营业状态]准备返回数据
     *参数:1、请求json参数；2、准备返回请求数据的Buff；3、返回错误信息；
     *返回:是否准备成功；
     **/
-    bool _ResponseSimphony12Request(const QJsonObject &content, QJsonObject &data,QString &error);
+    bool _ResponseOMS12Request(const QJsonObject &content, QJsonObject &data,QString &error);
 
 
     /**

fmTakeout/QsLog/QsLogDest.cpp

@@ -27,6 +27,9 @@
 #include "QsLogDestConsole.h"
 #include "QsLogDestFile.h"
 #include "QsLogDestFunctor.h"
+#include <QDir>
+#include <QDate>
+#include <QDateTime>
 #include <QString>
 
 namespace QsLogging
@@ -37,6 +40,7 @@ Destination::~Destination()
 }
 
 //! destination factory
+/*
 DestinationPtr DestinationFactory::MakeFileDestination(const QString& filePath,
     LogRotationOption rotation, const MaxSizeBytes &sizeInBytesToRotateAfter,
     const MaxOldLogCount &oldLogsToKeep)
@@ -51,6 +55,32 @@ DestinationPtr DestinationFactory::MakeFileDestination(const QString& filePath,
 
     return DestinationPtr(new FileDestination(filePath, RotationStrategyPtr(new NullRotationStrategy)));
 }
+*/
+
+DestinationPtr DestinationFactory::MakeFileDestination(const QString& fileDir, const QString &filePrefix, int fileHoldDays,
+                                                       LogRotationOption rotation, const MaxSizeBytes &sizeInBytesToRotateAfter,const MaxOldLogCount &oldLogsToKeep){
+    //清理之前的日志
+    QDir dir(fileDir);
+    if(dir.exists()) {
+        dir.setFilter(QDir::Files | QDir::NoSymLinks);
+        QFileInfoList list = dir.entryInfoList();
+        foreach(QFileInfo info, list)  {
+            if(info.baseName().startsWith(filePrefix) && QDate::currentDate()>=info.lastModified().date().addDays(fileHoldDays))
+            { QFile(info.filePath()).remove();}
+        }
+    }
+    QString logPath = QString("%1/%2%3.log").arg(fileDir, filePrefix, QDate::currentDate().toString("yyyy-MM-dd"));
+
+    if (EnableLogRotation == rotation) {
+        QScopedPointer<SizeRotationStrategy> logRotation(new SizeRotationStrategy);
+        logRotation->setMaximumSizeInBytes(sizeInBytesToRotateAfter.size);
+        logRotation->setBackupCount(oldLogsToKeep.count);
+        return DestinationPtr(new FileDestination(logPath, RotationStrategyPtr(logRotation.take())));
+    }
+    return DestinationPtr(new FileDestination(logPath, RotationStrategyPtr(new NullRotationStrategy)));
+}
+
+
 
 DestinationPtr DestinationFactory::MakeDebugOutputDestination()
 {

fmTakeout/QsLog/QsLogDest.h

@@ -94,10 +94,21 @@ struct QSLOG_SHARED_OBJECT MaxOldLogCount
 class QSLOG_SHARED_OBJECT DestinationFactory
 {
 public:
+    /*
     static DestinationPtr MakeFileDestination(const QString& filePath,
         LogRotationOption rotation = DisableLogRotation,
         const MaxSizeBytes &sizeInBytesToRotateAfter = MaxSizeBytes(),
         const MaxOldLogCount &oldLogsToKeep = MaxOldLogCount());
+    */
+
+    static DestinationPtr MakeFileDestination(const QString& fileDir,
+           const QString& filePrefix,
+           int fileHoldDays = 10,
+           LogRotationOption rotation = DisableLogRotation,
+           const MaxSizeBytes &sizeInBytesToRotateAfter = MaxSizeBytes(),
+           const MaxOldLogCount &oldLogsToKeep = MaxOldLogCount());
+
+
     static DestinationPtr MakeDebugOutputDestination();
     // takes a pointer to a function
     static DestinationPtr MakeFunctorDestination(Destination::LogFunction f);

fmTakeout/main.cpp

@@ -20,6 +20,7 @@ QString g_appDir;
 QThread tcpThread;
 QThread  workThread;
 
+/*
 void InitLogger()
 {
     QString logDir = QString("%1/log").arg(g_appDir);
@@ -33,6 +34,20 @@ void InitLogger()
     DestinationPtr consoleDst(DestinationFactory::MakeDebugOutputDestination());
     logger.addDestination(consoleDst);
 }
+*/
+
+void InitLogger(){
+    QString logDir = QString("%1/log").arg(g_appDir);
+    QDir().mkdir(logDir);
+    QsLogging::Logger& logger = QsLogging::Logger::instance();
+    logger.setLoggingLevel(QsLogging::TraceLevel);
+    //日志按天输出
+    QsLogging::DestinationPtr fileDst(QsLogging::DestinationFactory::MakeFileDestination(logDir,"FmPlugin", 30,QsLogging::EnableLogRotation,
+    QsLogging::MaxSizeBytes(10*1024*1024), QsLogging::MaxOldLogCount(50)));
+    logger.addDestination(fileDst);
+    QsLogging::DestinationPtr consoleDst(QsLogging::DestinationFactory::MakeDebugOutputDestination());
+    logger.addDestination(consoleDst);
+}
 
 void LoadTheme(const QString& theme)
 {

fmTakeout/preDefine.h

@@ -173,6 +173,7 @@
 #define REMIND_REQREFUND_ORDER  7   // 请求退单的订单: 目前如果有请求退单；POS会自动发起退单请求，完成退单动作；
 #define REMIND_AGRREFUND_ORDER  30
 #define REMIND_COMPLAINT_ORDER  12   // 客诉单：最多且重要的case；
+#define REMIND_SIM_ORDERLIST_NOEMPTY  50   // Simphony有效队列中存在有订单待录入:就需要闪烁提醒；