1.添加QA测试环境区分;2.决绝退单的订单不再提示;3.打印移动到单独的线程;

takeout/control/ordergetwork.h

@@ -284,6 +284,7 @@ private:
 
     static bool getAction(int REQ, QString &action)
     {
+#ifndef USE_QAACTION
         switch (REQ)
         {
             case FMH_BIND:
@@ -322,6 +323,46 @@ private:
             default:
                 return false;
         }
+#else
+        switch (REQ)
+        {
+            case FMH_BIND:
+                action = QString("qasaas.posdevice.bind");
+                return true;
+            case FMH_LOGIN:
+                action = QString("qasaas.posdevice.login");
+                return true;
+            case FMH_GETORDER:
+                action = QString("qasaas.order.get");
+                return true;
+            case FMH_MAKEOVER:
+                action = QString("qasaas.order.doneNotify");
+                return true;
+            case FMH_CONFIRM:
+                action = QString("qasaas.order.confirmTake");
+                return true;
+            case FMH_REFUSE:
+                action = QString("qasaas.order.rejectTake");
+                return true;
+            case FMH_SENDOUT:
+                action = QString("qasaas.dispatch.create");
+                return true;
+            case FMH_COMPLETE:
+                action = QString("qasaas.dispatch.finish");
+                return true;
+            case FMH_REFUSEREFUND:
+                action = QString("qasaas.refund.reject");
+                return true;
+            case FMH_REFUNDORDER:
+                action = QString("qasaas.refund.agree");
+                return true;
+            case FMH_GETRORDER:
+                action = QString("qasaas.order.get");
+                return true;
+            default:
+                return false;
+        }
+#endif
     }
 
     static bool requestGetRSASign(int reqtype, const QJsonObject &json, QString &sign, QString &action, QString &access_token, QString &ver)

takeout/main.cpp

@@ -126,6 +126,7 @@ int main(int argc, char *argv[])
     QLOG_INFO() << "--------------------------------takeout start------------------------------------";
     QThread thread;
     QThread threadt;
+    QThread prtthreadt;
     QLOG_INFO() << "Thread List :" << &thread << &threadt << QThread::currentThread();
     //初始化打印文件
     InitPtr();
@@ -148,7 +149,7 @@ int main(int argc, char *argv[])
     //移动子工作流到线程
     loac.moveToThread(&thread);
     work.moveToThread(&thread);
-    printwork.moveToThread(&thread);
+    printwork.moveToThread(&prtthreadt);
     pwork.moveToThread(&threadt);
     //关联主动启动工作流和线程同时启动
     QObject::connect(&thread, &QThread::started, &work, &OrderGetWork::workStart);
@@ -156,6 +157,7 @@ int main(int argc, char *argv[])
     //启动tcp长链接和拉单工作流
     thread.start();
     threadt.start();
+    prtthreadt.start();
     //界面类定义及初始化
     MainForm mainform;
     LoginForm loginform;

takeout/takeout.pro

@@ -21,6 +21,8 @@ LIBS += -L$$PWD/lib -llibeay32 -lssleay32 -lwinspool
 LIBS += -lWs2_32
 LIBS += -lDbghelp
 
+#DEFINES += USE_QAACTION
+
 #DEFINES += FM_TEST
 #DEFINES += FM_MAIN_TEST
 RC_FILE += takeout.rc

takeout/takeout.rc

@@ -4,8 +4,8 @@
 #include <winver.h>
 #endif
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 3,0,0,2
-    PRODUCTVERSION 3,0,0,2
+    FILEVERSION 3,0,0,4
+    PRODUCTVERSION 3,0,0,4
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
     FILEFLAGS VS_FF_DEBUG
@@ -22,12 +22,12 @@ VS_VERSION_INFO VERSIONINFO
             BEGIN
                 VALUE "CompanyName", "ShangHai Freemud Co., Ltd."
                 VALUE "FileDescription", "FREEMUD Manager System"
-                VALUE "FileVersion", "3.0.0.2"
+                VALUE "FileVersion", "3.0.0.4"
                 VALUE "InternalName", "FREEMUD"
                 VALUE "LegalCopyright", "Copyright (C)2017-2020"
                 VALUE "OriginalFilename", "fmTakeout.exe"
                 VALUE "ProductName", "fmTakeout"
-                VALUE "ProductVersion", "3.0.0.2"
+                VALUE "ProductVersion", "3.0.0.4"
             END
         END
         BLOCK "VarFileInfo"

takeout/view/floatForm.cpp

@@ -113,7 +113,7 @@ bool FloatForm::event(QEvent *e)
         QString autoconf = QSettings(configfile, QSettings::IniFormat).value(INI_AUTOCONFIRM, "0").toString();
 
         if(!oldorder && ((orderstatus == NewOrder && autoconf.toInt() == 0) || (orderstatus == FirmOrder && autoconf.toInt() == 1)) &&
-                refundstatus != ApplicationRefundOrder && refundstatus != ApplicationPartialRefundOrder)
+                refundstatus != ApplicationRefundOrder && refundstatus != ApplicationPartialRefundOrder && refundstatus != RefusingRefundOrder)
         {
             onStartRemind(0);
             return true;