1、修复登陆时崩溃的bug 2、修复交接班按钮点击无反应现象 3、修改交接班打印模板 4、新增门店电话打印

takeout/base/Arithmetic/cretopt.cpp

+#include "cretopt.h"
+
+
+QMutex CretOperate::s_RSAlock;

takeout/base/Arithmetic/cretopt.h

@@ -8,6 +8,7 @@
 #include <QString>
 #include <QJsonObject>
 #include <QJsonDocument>
+#include <QMutex>
 #include "QsLog.h"
 
 #include "preDefine.h"
@@ -35,11 +36,13 @@ public:
 
         char tmp[MAX_SIGN_LEN] = { 0 };
 
+        s_RSAlock.lock();
         if(DataProcess::RSASign(array.data(), tmp, MAX_SIGN_LEN, SHA256RSA_PRIVATEKEY) == 0)
         {
             QLOG_ERROR() << "get RSASign failed";
             return false;
         }
+        s_RSAlock.unlock();
 
         QLOG_INFO() << "get RSA sign:" << tmp;
 
@@ -53,6 +56,9 @@ public:
 
         return true;
     }
+
+private:
+    static QMutex s_RSAlock;
 };
 
 #endif // CRETOPT

takeout/base/Arithmetic/dataprocess.h

@@ -19,6 +19,7 @@
 #include <QStringList>
 
 #include <assert.h>
+#include "preDefine.h"
 
 class DataProcess
 {

takeout/base/Print/newprintlib.cpp

@@ -379,6 +379,7 @@ bool NewPrintLib::DoPrint(const QString &config, const QString &context, OrderOb
 
     QLOG_DEBUG() << "prt_type" << type;
 
+
     QLOG_DEBUG() << "NewNew tmporder._orderObject :" << tmporder._orderObject;
     QByteArray orderdata = QString(QJsonDocument(tmporder._orderObject).toJson()).toLocal8Bit();
     CONSTCHARTOCHAR(orderdata, orderinfo);

takeout/control/ordergetwork.cpp

@@ -586,7 +586,10 @@ void OrderGetWork::optOrder(const QJsonArray &orders)
         orderObject.FromJson(jsonObject);
 
         if(_storeinfo.contains(LOGIN_STORE_PHONE))
+        {
+            orderObject._orderObject.insert(LOGIN_NEWSTORE_PHONE,_storeinfo[LOGIN_STORE_PHONE].toString());
             orderObject.setStore_phone(_storeinfo[LOGIN_STORE_PHONE].toString());
+        }
 
         QLOG_DEBUG() << "----------------------------:" << orderObject.delivery_time;
 

takeout/control/stallsgetwork.cpp

@@ -68,7 +68,7 @@ void StallsGetWork::workstart()
         loop.exec();
     }
 
-    QLOG_DEBUG() << "StallsGetWork::workstart loop quit";
+    QLOG_DEBUG() << "StallsGetWork::workstart loop start";
 
     while(!_stopflag)
     {

takeout/preDefine.h

@@ -165,6 +165,7 @@
 
 #define LOGIN_STORE_NAME            "store_name"
 #define LOGIN_STORE_PHONE           "phone"
+#define LOGIN_NEWSTORE_PHONE           "store_phone"
 #define LOGIN_RESULT                "result"
 
 #define JSON_KEY_USERID             "user_id"

takeout/takeout.pro

@@ -82,7 +82,8 @@ SOURCES += main.cpp \
     base/System/downloader.cpp \
     control/prtmodelgetwork.cpp \
     model/prtmodelpool.cpp \
-    view/newchangeshiftsform.cpp
+    view/newchangeshiftsform.cpp \
+    base/Arithmetic/cretopt.cpp
 
 HEADERS  += \
     event/fmapplication.h \
@@ -165,4 +166,8 @@ FORMS += \
     view/newloginform.ui \
     view/newpickupform.ui \
     view/newchangeshiftsform.ui
+
+CONFIG(release, debug|release){
+    QMAKE_LFLAGS += /DEBUG
+}
     

takeout/view/newchangeshiftsform.cpp

-#include "newchangeshiftsform.h"
+#include "newchangeshiftsform.h"
 #include "ui_newchangeshiftsform.h"
 #include <QDateTime>
 #include <QNetworkAccessManager>
@@ -161,11 +161,11 @@ bool NewChangeShiftsForm::Print()
             QLOG_DEBUG()  << "DoPrint" << flag;
             break;
         default:
-            return false;
-
-            if(flag == false)
-                break;
+            break;
         }
+
+        if(flag == false)
+            break;
     }
     if(!flag) {
         QLOG_DEBUG() << "print failed : ";
@@ -176,8 +176,19 @@ bool NewChangeShiftsForm::Print()
         tmpmap.insert(EVENT_KEY_MSG, QString("").append(QString::fromUtf8("\x20\xE6\x89\x93\xE5\x8D\xB0\xE5\xA4\xB1\xE8\xB4\xA5")));
 
         POSTEVENTTYPE(PosEvent::s_opt_status,tmpmap,QVariantMap);
+        return false;
+    } else {
+        QLOG_DEBUG() << "print success : ";
+
+        QVariantMap tmpmap;
+
+        tmpmap.insert(EVENT_KEY_STATUS, true);
+        tmpmap.insert(EVENT_KEY_MSG, QString("").append(QString::fromUtf8("\xE6\x89\x93\xE5\x8D\xB0\xE6\x88\x90\xE5\x8A\x9F")));
+
+        POSTEVENTTYPE(PosEvent::s_opt_status,tmpmap,QVariantMap);
+        return true;
     }
-    return flag;
+
 }
 
 void NewChangeShiftsForm::DoPrint(const QString &prtname, const QVariantMap config, bool &flag)
@@ -204,6 +215,8 @@ void NewChangeShiftsForm::DoPrint(const QString &prtname, const QVariantMap conf
     order._orderObject.insert("couponOrderTotality", tmpobj["couponOrderTotality"].toInt());
     order._orderObject.insert("search_start_time", tmpobj["search_start_date"].toString());
     order._orderObject.insert("search_end_time", tmpobj["search_end_date"].toString());
+    order._orderObject.insert("package_fee", tmpobj["package_fee"].toInt());
+    order._orderObject.insert("send_fee", tmpobj["send_fee"].toInt());
 
     QLOG_DEBUG() << "NewChangeShiftsForm::DoPrint" << prtname << config;
 
@@ -248,6 +261,12 @@ void NewChangeShiftsForm::DoPrint(const QString &prtname, const QVariantMap conf
 
 void NewChangeShiftsForm::on_prtBtn_clicked()
 {
+
+    QVariantMap smap;
+    smap.insert(EVENT_KEY_ORDERSTATUS, 0);
+    smap.insert(EVENT_KEY_MSG, QString::fromLocal8Bit("通讯中..."));
+    POSTEVENTTYPE(PosEvent::s_opt_status,smap,QVariantMap);
+
     QJsonObject json, recvjson;
     QString realurl;
     QString error;
@@ -263,6 +282,12 @@ void NewChangeShiftsForm::on_prtBtn_clicked()
     if(!GetShiftDataProcess::getRealUrl(ADVANCEORDER, json, _url, realurl))
     {
         QLOG_ERROR() << "GetShiftDataProcess getRealUrl failed";
+        QVariantMap tmpmap;
+
+        tmpmap.insert(EVENT_KEY_STATUS, false);
+        tmpmap.insert(EVENT_KEY_MSG, QString::fromLocal8Bit("获取请求链接失败"));
+
+        POSTEVENTTYPE(PosEvent::s_opt_status,tmpmap,QVariantMap);
         return;
     }
 
@@ -271,6 +296,12 @@ void NewChangeShiftsForm::on_prtBtn_clicked()
     if(!GetShift(json, recvjson, realurl, error))
     {
         QLOG_ERROR() << "GetShift failed : " << error;
+        QVariantMap tmpmap;
+
+        tmpmap.insert(EVENT_KEY_STATUS, false);
+        tmpmap.insert(EVENT_KEY_MSG, QString::fromLocal8Bit("网络错误").append(error));
+
+        POSTEVENTTYPE(PosEvent::s_opt_status,tmpmap,QVariantMap);
         return;
     }
 
@@ -279,6 +310,8 @@ void NewChangeShiftsForm::on_prtBtn_clicked()
     _order = recvjson;
 
     bool flag = Print();
+
+    QLOG_DEBUG() << "NewChangeShiftsForm::flag:" << flag;
     if(flag) {
 
         QString dateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm");

takeout/view/newdetailform.cpp

@@ -246,7 +246,7 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
     }
 
     ui->product_numLb->setText(QString::number(orderObject->total_amount));
-    ui->product_price_Lb->setText(QString::number((orderObject->product_fee - orderObject->package_fee)/100.0));
+    ui->product_price_Lb->setText(QString::number((orderObject->product_fee)/100.0));
 
     ui->package_price_Lb->setText(QString::number(orderObject->package_fee/100.0));
     ui->delivery_price_Lb->setText(QString::number(orderObject->send_fee/100.0));

takeout/view/newmainform.cpp

@@ -868,7 +868,9 @@ void NewMainForm::getOrderChannelName(OrderObject *order, QString &channelname)
 
 void NewMainForm::InsertTableWidget(OrderObject &orderObject)
 {
+
     QTableWidget *table = ui->newmaintablewidget_order;
+    ui->newmaintablewidget_order->setSortingEnabled(false);
     table->insertRow(0);
     //QTableWidgetItem *item = new QTableWidgetItem(QString::number(orderObject.order_index));
     QTableWidgetItem *item = new QTableWidgetItem();
@@ -914,7 +916,7 @@ void NewMainForm::InsertTableWidget(OrderObject &orderObject)
 
     //qDebug() << _curr_check_btn->property("type").toString();
 
-    ui->newmaintablewidget_order->setSortingEnabled(false);
+
     ClassifyOrder(_curr_check_btn->property("type").toString());
     ui->newmaintablewidget_order->setSortingEnabled(true);