测试token1.区分自提单打印和外卖单打印;2.添加新老门店配置兼容;3.修复新订单到来提示

takeout/base/Print/printDocument.cpp

@@ -34,11 +34,11 @@ PrintDocument PrintDocument::ParseToDocument(const QByteArray &content, bool res
     int indexForword=0,indexBack=0;
     while(indexBack!=(content.length()-1)&&indexBack!=-1&&indexForword!=-1)
     {
-        indexForword = content.indexOf('<',0);
-        indexBack = content.indexOf('>',0);
+        indexForword = content.indexOf('<',indexBack);
+        indexBack = content.indexOf('>',indexForword);
         if(indexBack!=-1&&indexForword!=-1)
         {
-            QString printLine = content.mid(indexForword+1,indexBack-indexForword-2);
+            QString printLine = content.mid(indexForword+1,indexBack-indexForword-1);
             LineNode *node = new LineNode(printLine,&doc);
             doc._nodeList.append(node);
         }
@@ -56,11 +56,12 @@ PrintDocument PrintDocument::ParseToDocument(const QString &content, bool &resul
 {
     PrintDocument doc;
     result = true;
-    int indexForword=0,indexBack=0;
+    int indexForword=0,indexBack=0,index =0;
     while(indexBack!=(content.length()-1)&&indexBack!=-1&&indexForword!=-1)
     {
         indexForword = content.indexOf('<',indexBack);
         indexBack = content.indexOf('>',indexForword);
+        index++;
         if(indexBack!=-1&&indexForword!=-1)
         {
             QString printLine = content.mid(indexForword+1,indexBack-indexForword-1);
@@ -75,6 +76,7 @@ PrintDocument PrintDocument::ParseToDocument(const QString &content, bool &resul
         {
             result = false;
             error = "lock of '<' or '>'";
+            qDebug()<<index<<"----------------------------------------";
             return PrintDocument();
         }
     }

takeout/control/ordergetwork.cpp

@@ -387,6 +387,14 @@ void OrderGetWork::SetStoreInfoToConfig()
     QSettings(configfile, QSettings::IniFormat).setValue(INI_BASE_STATIONIID, _storeinfo[JSON_STATIONID]);
     QSettings(configfile, QSettings::IniFormat).setValue(INI_BASE_USERID, _storeinfo[JSON_KEY_USERID]);
     QSettings(configfile, QSettings::IniFormat).setValue(INI_BASE_PWD, _storeinfo[JSON_KEY_PWD]);
+
+    QString tmpconfigfile = qApp->applicationDirPath() + "/" + CONFIG_NAME;
+
+    QSettings(tmpconfigfile, QSettings::IniFormat).setValue(INI_BASE_PARNETID, _storeinfo[JSON_KEY_PARTNERID]);
+    QSettings(tmpconfigfile, QSettings::IniFormat).setValue(INI_BASE_STOREID, _storeinfo[JSON_STOREID]);
+    QSettings(tmpconfigfile, QSettings::IniFormat).setValue(INI_BASE_STATIONIID, _storeinfo[JSON_STATIONID]);
+    QSettings(tmpconfigfile, QSettings::IniFormat).setValue(INI_BASE_USERID, _storeinfo[JSON_KEY_USERID]);
+    QSettings(tmpconfigfile, QSettings::IniFormat).setValue(INI_BASE_PWD, _storeinfo[JSON_KEY_PWD]);
 }
 
 bool OrderGetWork::loginToServer(QString &error)

takeout/control/orderprintwork.cpp

@@ -48,7 +48,20 @@ bool orderprintwork::event(QEvent *e)
             QString error;
             QString content;
 
-            QFile file(qApp->applicationDirPath() + "/" + FILE_PRINT_TEMPLET);
+            //QFile file(qApp->applicationDirPath() + "/" + FILE_PRINT_TEMPLET);
+            QFile file;
+
+
+            if(order.order_type == 1 || order.order_type == 2)
+            {
+                file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINTTAKE_TEMPLET);
+            }
+            else
+            {
+                file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINT_TEMPLET);
+            }
+
+            qDebug() << "+++++++++++++++++++++++++++" << file.fileName();
 
             if(!file.open(QFile::ReadOnly))
             {

takeout/preDefine.h

@@ -14,12 +14,12 @@
 #define DEFAULT_DBNAME              "order.db"
 #define DEFAULT_DBFORM              "orderlist"
 
-//#define SHA256RSA_PRIVATEKEY        "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
-//#define DEFAULT_ACCESS_TOKEN        "1a3bd3e3-02b4-44ac-ab13-65069e85938b"
+#define SHA256RSA_PRIVATEKEY        "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
+#define DEFAULT_ACCESS_TOKEN        "1a3bd3e3-02b4-44ac-ab13-65069e85938b"
 
 //正式环境
-#define SHA256RSA_PRIVATEKEY         "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
-#define DEFAULT_ACCESS_TOKEN         "5c1bf782-a117-4aed-8ddc-66a415820d34"
+//#define SHA256RSA_PRIVATEKEY         "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
+//#define DEFAULT_ACCESS_TOKEN         "5c1bf782-a117-4aed-8ddc-66a415820d34"
 
 
 #define TIMEOUT_TRY_LOGING          20000
@@ -245,5 +245,6 @@
 #define VALUE_REFUSEREFUND_REASON  "拒绝退款"
 //
 #define FILE_PRINT_TEMPLET         "printtemplet.txt"
+#define FILE_PRINTTAKE_TEMPLET         "printtemplettake.txt"
 
 #endif // PREDEFINE_H

takeout/view/floatForm.cpp

@@ -57,19 +57,19 @@ bool FloatForm::event(QEvent *e)
         GETEVENTINFO(orderid,e,QString);
 
         int refundstatus, orderstatus;
-        bool neworder;
+        bool oldorder;
 
-        if(!PosOrderPool::GetOrderStatus(orderid, orderstatus, refundstatus, neworder))
+        if(!PosOrderPool::GetOrderStatus(orderid, orderstatus, refundstatus, oldorder))
             return true;
 
-        if(neworder && (orderstatus == NewOrder || orderstatus == FirmOrder) &&
+        if(!oldorder && (orderstatus == NewOrder || orderstatus == FirmOrder) &&
                 refundstatus != ApplicationRefundOrder)
         {
             onStartRemind(0);
             return true;
         }
 
-        if(neworder && (refundstatus == ApplicationRefundOrder || refundstatus == ApplicationPartialRefundOrder))
+        if(!oldorder && (refundstatus == ApplicationRefundOrder || refundstatus == ApplicationPartialRefundOrder))
         {
             onStartRemind(1);
             return true;